X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93599ac0451f913b3277b7edacde122806573972..96d8f9207f20a286140aed1a6385a8e1ff6fdba7:/include/wx/os2/private.h

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index b97c2bac5c..02a11b3ac5 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        private.h
+// Name:        wx/os2/private.h
 // Purpose:     Private declarations: as this header is only included by
 //              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
@@ -19,20 +19,50 @@
 #define INCL_GPI
 #define INCL_WINSYS
 #define INCL_SHLERRORS
+#define INCL_DOS
 #include <os2.h>
+
+#if defined(__WATCOMC__) && defined(__WXMOTIF__)
+    #include <os2def.h>
+    #define I_NEED_OS2_H
+    #include <X11/Xmd.h>
+
+    // include this header from here for many of the GUI related code
+    #if wxUSE_GUI
+        extern "C" {
+            #include <Xm/VendorSP.h>
+        }
+    #endif
+
+    // 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
+
 #if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA)
- typedef struct _SPBCDATA {
-   ULONG     cbSize;       /*  Size of control block. */
-   ULONG     ulTextLimit;  /*  Entryfield text limit. */
-   LONG      lLowerLimit;  /*  Spin lower limit (numeric only). */
-   LONG      lUpperLimit;  /*  Spin upper limit (numeric only). */
-   ULONG     idMasterSpb;  /*  ID of the servant's master spinbutton. */
-   PVOID     pHWXCtlData;  /*  Handwriting control data structure flag. */
- } SPBCDATA;
-
- typedef SPBCDATA *PSPBCDATA;
+
+    typedef struct _SPBCDATA {
+        ULONG     cbSize;       /*  Size of control block. */
+        ULONG     ulTextLimit;  /*  Entryfield text limit. */
+        LONG      lLowerLimit;  /*  Spin lower limit (numeric only). */
+        LONG      lUpperLimit;  /*  Spin upper limit (numeric only). */
+        ULONG     idMasterSpb;  /*  ID of the servant's master spinbutton. */
+        PVOID     pHWXCtlData;  /*  Handwriting control data structure flag. */
+    } SPBCDATA;
+
+    typedef SPBCDATA *PSPBCDATA;
+
 #endif
 
+#include "wx/dlimpexp.h"
 #include "wx/fontenc.h"
 
 class WXDLLEXPORT wxFont;
@@ -127,16 +157,6 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
 #define CASTWNDPROC (WndProcCast)
 
-#if wxUSE_ITSY_BITSY
-    #define IBS_HORZCAPTION    0x4000L
-    #define IBS_VERTCAPTION    0x8000L
-
-    UINT    APIENTRY ibGetCaptionSize( HWND hWnd  ) ;
-    UINT    APIENTRY ibSetCaptionSize( HWND hWnd, UINT nSize ) ;
-    MRESULT APIENTRY ibDefWindowProc( HWND hWnd, ULONG ulMsg, MPARAM wParam, MPARAM lParam ) ;
-    VOID    APIENTRY ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
-#endif // wxUSE_ITSY_BITSY
-
 /*
  * Decide what window classes we're going to use
  * for this combination of CTl3D/FAFA settings
@@ -146,11 +166,11 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
 #define STATIC_FLAGS     (SS_TEXT|DT_LEFT|SS_LEFT|WS_VISIBLE)
 #define CHECK_CLASS      _T("BUTTON")
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP)
-#define CHECK_IS_FAFA   FALSE
+#define CHECK_IS_FAFA    FALSE
 #define RADIO_CLASS      _T("BUTTON" )
 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_VISIBLE)
 #define RADIO_SIZE       20
-#define RADIO_IS_FAFA   FALSE
+#define RADIO_IS_FAFA    FALSE
 #define PURE_WINDOWS
 /*  PM has no group box button style
 #define GROUP_CLASS      "BUTTON"
@@ -193,6 +213,34 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
     #define ENDSESSION_LOGOFF    0x80000000
 #endif
 
+#ifndef PMERR_INVALID_PARM
+    #define PMERR_INVALID_PARM 0x1303
+#endif
+
+#ifndef PMERR_INVALID_PARAMETERS
+    #define PMERR_INVALID_PARAMETERS 0x1208
+#endif
+
+#ifndef BOOKERR_INVALID_PARAMETERS
+    #define BOOKERR_INVALID_PARAMETERS -1
+#endif
+
+#ifndef DLGC_ENTRYFIELD
+    #define DLGC_ENTRYFIELD  0x0001
+#endif
+
+#ifndef DLGC_BUTTON
+    #define DLGC_BUTTON      0x0002
+#endif
+
+#ifndef DLGC_MLE
+    #define DLGC_MLE         0x0400
+#endif
+
+#ifndef DP_NORMAL
+    #define DP_NORMAL 0
+#endif
+
 // ---------------------------------------------------------------------------
 // debug messages -- OS/2 has no native debug output system
 // ---------------------------------------------------------------------------
@@ -238,21 +286,25 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 // global data
 // ---------------------------------------------------------------------------
 
+#ifdef __WXOS2__
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
+#endif
 
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 
+#ifdef __WXOS2__
 extern "C"
 {
 WXDLLEXPORT HINSTANCE wxGetInstance();
 }
 
 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
+#endif
 
 #include "wx/thread.h"
 static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid,