Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we

[wxWidgets.git] / include / wx / os2 / private.h

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index aab13247a9caff9986495b28e987e7fca1cd3cfd..02a11b3ac5014569292ec7326d92e4de0444adaa 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -26,13 +26,25 @@
     #include <os2def.h>
     #define I_NEED_OS2_H
     #include <X11/Xmd.h>
     #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
     #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)
 #endif
 
 #if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA)