X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22e0b22bac4acb88d983c635ad634a5fb1208552..1d421f0c396c4b29cc2e7a867845284a4108d3c0:/include/wx/os2/private.h?ds=sidebyside diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index 28b1ed31bf..6c34e32c5f 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: private.h // Purpose: Private declarations: as this header is only included by -// wxWindows itself, it may contain identifiers which don't start +// wxWidgets itself, it may contain identifiers which don't start // with "wx". // Author: Julian Smart // Modified by: @@ -11,31 +11,31 @@ // 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 -#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) -/* struct missing in "os2emx.h" */ - 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 -#undef WS_VISIBLE -#define WS_VISIBLE 0 +#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" @@ -48,19 +48,6 @@ class WXDLLEXPORT wxBitmap; // private constants // --------------------------------------------------------------------------- -// Conversion -static const double METRIC_CONVERSION_CONSTANT = 0.0393700787; - -// Scaling factors for various unit conversions -static const double mm2inches = (METRIC_CONVERSION_CONSTANT); -static const double inches2mm = (1/METRIC_CONVERSION_CONSTANT); - -static const double mm2twips = (METRIC_CONVERSION_CONSTANT*1440); -static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440)); - -static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72); -static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72)); - // // Constant strings for control names and classes // @@ -144,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 @@ -163,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" @@ -210,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 // --------------------------------------------------------------------------- @@ -247,7 +252,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message #define GetHfont() ((HFONT)GetHFONT()) #define GetHfontOf(font) ((HFONT)(font).GetHFONT()) -// OS/2 convention of the mask is opposed to the wxWindows one, so we need +// OS/2 convention of the mask is opposed to the wxWidgets one, so we need // to invert the mask each time we pass one/get one to/from Windows extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); @@ -318,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);