--- rhide-1.5/idemain.cc.orig	2003-03-22 11:25:11.000000000 +0200
+++ rhide-1.5/idemain.cc	2003-03-22 11:48:47.000000000 +0200
@@ -114,6 +114,10 @@
 
 #include <edhists.h>
 
+#if TV_MAJOR_VERSION==2
+#define dual_display TScreen::dual_display
+#endif
+
 void SaveScreen();
 void RestoreScreen();
 static int keep_temp_dir = 0;
@@ -1727,7 +1731,11 @@
           TMouse::suspend();
           update_flag = 0;
 #ifdef __linux__
+# if TV_MAJOR_VERSION==2
+          TScreen::suspend();
+# else
           RestoreScreen();
+# endif
 #else
           TScreen::suspend();
 #endif
@@ -1932,7 +1940,11 @@
   char *_rhide_opt = expand_rhide_spec("$(RHIDEOPT)");
   char *rhide_opt = NULL;
 
+#if TV_MAJOR_VERSION==2
+  TGKey::SetKbdMapping(TGKey::dosUseDirect);
+#else
   TGKey::useBIOS = 0;
+#endif
 
   if (*_rhide_opt)
   {
@@ -1977,9 +1989,11 @@
           break;
         case 'H':
 #ifdef __linux__
+# if TV_MAJOR_VERSION<2
           extern int install_console_sigs;
 
           install_console_sigs = 0;
+# endif
 #endif
           break;
         case 'S':
@@ -2001,7 +2015,11 @@
 #endif
           break;
         case 'K':
+#if TV_MAJOR_VERSION==2
+          TGKey::SetKbdMapping(TGKey::dosUseBIOS);
+#else
           TGKey::useBIOS = 1;
+#endif
           break;
         case 'G':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
@@ -2014,7 +2032,11 @@
 #endif
           break;
         case 'p':
+#if TV_MAJOR_VERSION==2
+          //#warning Fix me!
+#else
           TGKey::translateKeyPad = 0;
+#endif
           break;
         case 'k':
           arg = next_option(rhide_opt, rhide_opt_end, i, argc, argv);
--- rhide-1.5/idedebug.cc.orig	2003-03-22 11:30:58.000000000 +0200
+++ rhide-1.5/idedebug.cc	2003-03-22 11:31:40.000000000 +0200
@@ -49,6 +49,10 @@
 #define Uses_TDataWindow
 #include <libtvgdb.h>
 
+#if TV_MAJOR_VERSION==2
+#define dual_display TScreen::dual_display
+#endif
+
 static void RemoveSessionTempFiles(void);
 
 TDisassemblerWindow *dis_win;
--- rhide-1.5/ideprj.cc.orig	2003-03-22 11:46:13.000000000 +0200
+++ rhide-1.5/ideprj.cc	2003-03-22 11:51:51.000000000 +0200
@@ -316,18 +316,22 @@
 }
 
 /* They are in tscreen.cc */
+#if TV_MAJOR_VERSION<2
 void setBlinkState(void);
 void setIntenseState(void);
+#endif
 
 void
 SetProjectScreenMode()
 {
   if (TScreen::screenMode != Project.screen_mode)
     TProgram::application->setScreenMode(Project.screen_mode);
+#if TV_MAJOR_VERSION<2
   if (IntenseMode)
     setIntenseState();
   else
     setBlinkState();
+#endif
 }
 
 static void
--- rhide-1.5/rhgdb/main.cc.orig	2003-03-22 11:52:54.000000000 +0200
+++ rhide-1.5/rhgdb/main.cc	2003-03-22 11:57:24.000000000 +0200
@@ -62,6 +62,10 @@
 #include "rhgdb.h"
 
 
+#if TV_MAJOR_VERSION==2
+#define dual_display TScreen::dual_display
+#endif
+
 extern int RunProgram(const char *cmd,
                       Boolean redir_stderr, Boolean redir_stdout,
 
@@ -589,7 +593,7 @@
         case cmUserScreen:
         {
           TMouse::suspend();
-#if 0
+#if TV_MAJOR_VERSION==2
           TScreen::suspend();
 #else
           RestoreScreen();
@@ -790,12 +794,18 @@
           use_dual_display = 1;
           break;
         case 'M':
+#if TV_MAJOR_VERSION<2
           extern int use_mouse_handler;
 
           use_mouse_handler = 0;
+#endif
           break;
         case 'K':
+#if TV_MAJOR_VERSION==2
+          TGKey::SetKbdMapping(TGKey::dosUseBIOS);
+#else
           TGKey::useBIOS = 1;
+#endif
           break;
         case 'G':
 //          extern int screen_saving;