X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5b5c15cbee88549a8fbf1b9e70db8390bfb43eb..4508c2b01b806be847366f0b3da0f6e65ec23cc5:/include/wx/os2/private.h?ds=inline diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index 039859ed51..024663695b 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: @@ -20,33 +20,96 @@ #define INCL_WINSYS #define INCL_SHLERRORS #include +#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; +#endif #include "wx/fontenc.h" class WXDLLEXPORT wxFont; class WXDLLEXPORT wxWindow; +class WXDLLEXPORT wxString; +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 +// + +// +// Controls +// +WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxBitmapRadioButtonNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; + +// +// Class names +// +WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassName; +WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassNameNoRedraw; +WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassName; +WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassNameNoRedraw; +WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassName; +WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw; +WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassName; +WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassNameNR; +WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassName; +WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR; // --------------------------------------------------------------------------- // standard icons from the resources // --------------------------------------------------------------------------- +#ifdef __WXPM__ + WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON; @@ -55,6 +118,8 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; +#endif + // --------------------------------------------------------------------------- // this defines a CASTWNDPROC macro which casts a pointer to the type of a // window proc for PM. @@ -110,10 +175,14 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM); // Scale font to get edit control height #define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2) +#ifdef __WXPM__ + // Generic subclass proc, for panel item moving/sizing and intercept // EDIT control VK_RETURN messages extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message, WXWPARAM wParam, WXLPARAM lParam); +#endif + // --------------------------------------------------------------------------- // constants which might miss from some compilers' headers // --------------------------------------------------------------------------- @@ -163,7 +232,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); @@ -172,7 +241,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); // --------------------------------------------------------------------------- // The MakeProcInstance version of the function wxSubclassedGenericControlProc -WXDLLEXPORT_DATA(extern) wxGenericControlSubClassProc; +WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; @@ -185,19 +254,40 @@ extern "C" WXDLLEXPORT HINSTANCE wxGetInstance(); } +WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); + +#include "wx/thread.h" +static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid, + MPARAM mpParam1, MPARAM mpParam2) +{ + MRESULT vRes; + vRes = ::WinSendMsg(hwnd, ulMsgid, mpParam1, mpParam2); +#if wxUSE_THREADS + if (!wxThread::IsMain()) + ::WinPostMsg(hwnd, ulMsgid, mpParam1, mpParam2); +#endif + return vRes; +} +#define WinSendMsg MySendMsg + +#ifdef __WXPM__ + WXDLLEXPORT void wxDrawBorder( HPS hPS ,RECTL& rRect ,WXDWORD dwStyle ); -WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); - WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); + +WXDLLEXPORT void wxConvertVectorFontSize( FIXED fxPointSize + ,PFATTRS pFattrs + ); WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont ,PFACENAMEDESC pFaceName - ,HPS hPS + ,HPS* phPS + ,bool* pbInternalPS ,long* pflId ,wxString& sFaceName ,wxFont* pFont @@ -257,9 +347,17 @@ WXDLLEXPORT extern void wxOS2SetFont( HWND hWnd ); -WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd - ,WXFARPROC fnWndProc +WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd + ,WXFARPROC fnWndProc ); +WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp + ,long lColor + ); -#endif - // _WX_PRIVATE_H_ +#include "wx/colour.h" + +WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor); + +#endif // __WXPM__ + +#endif // _WX_PRIVATE_H_