Define SQLUINTEGER

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 024663695baf88c0d635235af80e9813e23de4b2..6c34e32c5f3869c7161311aaa98453e690f2d461 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -11,28 +11,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_PRIVATE_H_
-#define _WX_PRIVATE_H_
+#ifndef _WX_OS2_PRIVATE_H_
+#define _WX_OS2_PRIVATE_H_
 
 #define INCL_BASE
 #define INCL_PM
 #define INCL_GPI
 #define INCL_WINSYS
 #define INCL_SHLERRORS
+#define INCL_DOS
 #include <os2.h>
-#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(FCF_CLOSEBUTTON)
-/* struct missing in "os2emx.h" - luckily FCF_CLOSEBUTTON was added in the
-   same version of os2emx.h as SPBCDATA type, so we can do the test above. */
- 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;
+
+#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;
+
 #endif
 
 #include "wx/fontenc.h"
@@ -129,16 +131,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
@@ -148,11 +140,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"
@@ -195,6 +187,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
 // ---------------------------------------------------------------------------
@@ -303,7 +323,7 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT*      pLogFont
                                            ,PFONTMETRICS  pFM
                                            ,PFACENAMEDESC pFace
                                           );
-WXDLLEXPORT int    wxGpiStrcmp(char* s0, char* s1);
+WXDLLEXPORT int    wxGpiStrcmp(wxChar* s0, wxChar* s1);
 
 WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
 WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);