Applied wxImage -> wxCursor patch, tool window event table fix

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index d42540d24b5dc2617697aa203e615e7e3dd17367..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
 // ---------------------------------------------------------------------------
@@ -117,7 +191,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 // ---------------------------------------------------------------------------
 
 #if !defined(WS_EX_CLIENTEDGE)
-    #define WS_EX_CLIENTEDGE 0
+    #define WS_EX_CLIENTEDGE 0x00000200L
 #endif
 
 #ifndef ENDSESSION_LOGOFF
@@ -143,6 +217,9 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 #define GetHdc()                ((HDC)GetHDC())
 #define GetHdcOf(dc)            ((HDC)(dc).GetHDC())
 
+#define GetHbitmap()            ((HBITMAP)GetHBITMAP())
+#define GetHbitmapOf(bmp)       ((HBITMAP)(bmp).GetHBITMAP())
+
 #define GetHicon()              ((HICON)GetHICON())
 #define GetHiconOf(icon)        ((HICON)(icon).GetHICON())
 
@@ -152,6 +229,16 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 #define GetHmenu()              ((HMENU)GetHMenu())
 #define GetHmenuOf(menu)        ((HMENU)menu->GetHMenu())
 
+#define GetHcursor()            ((HCURSOR)GetHCURSOR())
+#define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
+
+#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
+// 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);
+
 // ---------------------------------------------------------------------------
 // global data
 // ---------------------------------------------------------------------------
@@ -170,6 +257,11 @@ extern "C"
 WXDLLEXPORT HINSTANCE wxGetInstance();
 }
 
+WXDLLEXPORT void wxDrawBorder( HPS     hPS
+                              ,RECTL&  rRect
+                              ,WXDWORD dwStyle
+                             );
+
 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
@@ -177,8 +269,19 @@ WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName
-                                 ,const wxFont* pFont
+                                 ,HPS*          phPS
+                                 ,bool*         pbInternalPS
+                                 ,long*         pflId
+                                 ,wxString&     sFaceName
+                                 ,wxFont*       pFont
                                 );
+WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int nCharSet);
+WXDLLEXPORT void   wxOS2SelectMatchingFontByName( PFATTRS       vFattrs
+                                                 ,PFACENAMEDESC pFaceName
+                                                 ,PFONTMETRICS  pFM
+                                                 ,int           nNumFonts
+                                                 ,const wxFont* pFont
+                                                );
 WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT*      pLogFont
                                            ,PFONTMETRICS  pFM
                                            ,PFACENAMEDESC pFace
@@ -214,5 +317,22 @@ inline bool wxStyleHasBorder(long style)
                    wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
 }
 
+inline RECTL wxGetWindowRect(HWND hWnd)
+{
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(hWnd, &vRect);
+    return vRect;
+} // end of wxGetWindowRect
+
+WXDLLEXPORT extern void wxOS2SetFont( HWND          hWnd
+                                     ,const wxFont& rFont
+                                    );
+
+
+WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND                            hWnd
+                                             ,WXFARPROC                         fnWndProc
+                                            );
+
 #endif
     // _WX_PRIVATE_H_