X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..015dca24cabea5750e808e7c5f9505165b023c90:/include/wx/os2/private.h

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index aab13247a9..d5481d7add 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -20,19 +20,44 @@
 #define INCL_WINSYS
 #define INCL_SHLERRORS
 #define INCL_DOS
+#define INCL_WINATOM
+#define INCL_WIN
 #include <os2.h>
 
+#if defined(__WATCOMC__) && ( __WATCOMC__ < 1240 )
+    // missing in OpenWatcom 1.3 but added in 1.4
+    inline HATOMTBL APIENTRY WinQuerySystemAtomTable(VOID){return NULL;}
+    inline ULONG APIENTRY WinQueryAtomName(HATOMTBL,ATOM,PCSZ,ULONG){return 0;}
+    inline LONG APIENTRY GpiPointArc(HPS,PPOINTL){return GPI_ERROR;}
+    inline BOOL APIENTRY WinDrawPointer(HPS,LONG,LONG,HPOINTER,ULONG){return FALSE;}
+    inline HPOINTER APIENTRY WinCreatePointerIndirect(HWND,PPOINTERINFO){return NULLHANDLE;}
+    inline BOOL APIENTRY WinGetMaxPosition(HWND,PSWP){return FALSE;}
+    inline BOOL APIENTRY WinGetMinPosition(HWND,PSWP,PPOINTL){return FALSE;}
+#endif
+
 #if defined(__WATCOMC__) && defined(__WXMOTIF__)
     #include <os2def.h>
     #define I_NEED_OS2_H
     #include <X11/Xmd.h>
-    #ifdef __cplusplus
-    extern "C" {
+
+    // include this header from here for many of the GUI related code
+    #if wxUSE_GUI
+        extern "C" {
+            #include <Xm/VendorSP.h>
+        }
     #endif
-        #include <Xm/VendorSP.h>
-    #ifdef __cplusplus
+
+    // provide Unix-like pipe()
+    #include <types.h>
+    #include <tcpustd.h>
+    #include <sys/time.h>
+    // Use ::DosCreatePipe or ::DosCreateNPipe under OS/2
+    // for more see http://posix2.sourceforge.net/guide.html
+    inline int pipe( int WXUNUSED(filedes)[2] )
+    {
+        wxFAIL_MSG(wxT("Implement first"));
+        return -1;
     }
-    #endif
 #endif
 
 #if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA)
@@ -274,7 +299,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 // global data
 // ---------------------------------------------------------------------------
 
-#ifdef __WXOS2__
+#ifdef __WXPM__
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
@@ -285,7 +310,7 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 // global functions
 // ---------------------------------------------------------------------------
 
-#ifdef __WXOS2__
+#ifdef __WXPM__
 extern "C"
 {
 WXDLLEXPORT HINSTANCE wxGetInstance();