Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a1afb719f4bda7f72d5ad631560534971a5f4ed7..77c409132eec9f46a8b63bf252d82c99c7b3e1f3 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -20,9 +20,25 @@
 #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"
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxString;
 
 // ---------------------------------------------------------------------------
 // private constants
@@ -41,6 +57,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
 // ---------------------------------------------------------------------------
@@ -195,7 +269,8 @@ WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName
-                                 ,HPS           hPS
+                                 ,HPS*          phPS
+                                 ,bool*         pbInternalPS
                                  ,long*         pflId
                                  ,wxString&     sFaceName
                                  ,wxFont*       pFont