20000311-18:52 GMT+1 Victor Szakats <info@szelvesz.hu>

harbour/source/rtl/console.c

@@ -68,13 +68,10 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 #include "hbapifs.h"
+#include "hbapigt.h"
 #include "hbdate.h"
 #include "hbset.h"
-#include "hbinkey.h"
 #include "inkey.ch"
-#include "hbapigt.h"            /* HARBOUR_USE_GTAPI is checked inside hbapigt.h, so that
-                                 we can always get the border styles */
-#include "hbapimou.h"
 
 #if defined(__GNUC__) && ! defined(__MINGW32__)
    #include <unistd.h>

harbour/source/rtl/inkey.c

@@ -111,8 +111,8 @@
 #include "hbvm.h"
 #include "hbapierr.h"
 #include "hbapiitm.h"
+#include "hbapigt.h"
 #include "hbset.h"
-#include "hbinkey.h"
 #include "inkey.ch"
 #include "hbinit.h"
 

harbour/source/rtl/mouse/mousedos.c

@@ -42,7 +42,6 @@
    #include <dos.h>
 #endif
 
-#include "hbapimou.h"
 #include "hbapigt.h"
 
 /* C callable low-level interface */

harbour/source/rtl/mouse/mouseos2.c

@@ -49,7 +49,7 @@
 #define INCL_NOPMAPI         /* exclude Presentation Manager Include File */
 
 #include <os2.h>
-#include "hbapimou.h"
+#include "hbapigt.h"
 
 static HMOU s_uMouHandle;                   /* mouse logical handle */
 

harbour/source/rtl/mouse/mousestd.c

@@ -33,7 +33,7 @@
  *
  */
 
-#include "hbapimou.h"
+#include "hbapigt.h"
 
 /* NOTE: This file is a simple stub for those platforms which don't have
          any kind of mouse support. [vszakats] */

harbour/source/rtl/mouse/mousetpl.c

@@ -33,7 +33,7 @@
  *
  */
 
-#include "hbapimou.h"
+#include "hbapigt.h"
 
 /* C callable low-level interface */
 

harbour/source/rtl/mouse/mousewin.c

@@ -40,7 +40,7 @@
 #endif /* __GNUC__ */
 
 #include <windows.h>
-#include "hbapimou.h"
+#include "hbapigt.h"
 
 #if defined(__IBMCPP__)
    #undef WORD                            /* 2 bytes unsigned */

harbour/source/rtl/mouseapi.c

@@ -46,7 +46,6 @@
 
 #include "hbapi.h"
 #include "hbapiitm.h"
-#include "hbapimou.h"
 #include "hbapigt.h"
 
 static BOOL   s_bPresent;

harbour/source/rtl/set.c

@@ -195,8 +195,8 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 #include "hbapifs.h"
+#include "hbapigt.h"
 #include "hbset.h"
-#include "hbinkey.h"
 
 HB_SET_STRUCT hb_set;
 

harbour/source/rtl/tone.c

@@ -80,7 +80,7 @@
 #endif
 
 #include "hbapi.h"
-#include "hbinkey.h" /* For hb_releaseCPU() */
+#include "hbapigt.h" /* For hb_releaseCPU() */
 
 #if defined(HARBOUR_GCC_OS2)
    ULONG DosBeep( ULONG ulFrequency, ULONG ulDuration );

harbour/source/vm/hvm.c

@@ -56,9 +56,9 @@
 #include "hbapiitm.h"
 #include "hbapilng.h"
 #include "hbapirdd.h"
+#include "hbapigt.h"
 #include "hbpcode.h"
 #include "hbset.h"
-#include "hbinkey.h"
 
 typedef struct _SYMBOLS
 {