X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc95f4f9477e96ac2ce9a18f410ef98a169a75a6..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/os2/private.h?ds=sidebyside

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a1afb719f4..7b57d7f594 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -20,9 +20,27 @@
 #define INCL_WINSYS
 #define INCL_SHLERRORS
 #include <os2.h>
+#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
+
+#include "wx/fontenc.h"
+#include "wx/colour.h"
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxString;
+class WXDLLEXPORT wxBitmap;
 
 // ---------------------------------------------------------------------------
 // private constants
@@ -41,6 +59,64 @@ 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
 // ---------------------------------------------------------------------------
@@ -193,9 +269,14 @@ 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
@@ -255,9 +336,13 @@ 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
+                                           );
+
+WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+#endif // _WX_PRIVATE_H_
 
-#endif
-    // _WX_PRIVATE_H_