changing to wxDC, so that wxGCDC can be used as well

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index c8064639aad822de06cf96606c05849e300db27a..6e8ffebd534c22530e59ed5a3b9add1e4b0709ad 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -19,6 +19,7 @@
 #define INCL_GPI
 #define INCL_WINSYS
 #define INCL_SHLERRORS
+#define INCL_GPIERRORS
 #define INCL_DOS
 #define INCL_WINATOM
 #define INCL_WIN
@@ -77,10 +78,10 @@
 #include "wx/dlimpexp.h"
 #include "wx/fontenc.h"
 
-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxString;
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_BASE wxString;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 // ---------------------------------------------------------------------------
 // private constants
@@ -93,42 +94,36 @@ class WXDLLEXPORT wxBitmap;
 //
 // 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 char)   wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxCheckBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxChoiceNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxComboBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDialogNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxFrameNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxGaugeNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxListBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticLineNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticTextNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStaticBitmapNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxPanelNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxRadioBoxNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxRadioButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxBitmapRadioButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxScrollBarNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxSliderNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxTextCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxToolBarNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxStatusLineNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxGetTextFromUserPromptStr[];
+WXDLLEXPORT_DATA(extern const char)   wxMessageBoxCaptionStr[];
+WXDLLEXPORT_DATA(extern const char)   wxFileSelectorPromptStr[];
+WXDLLEXPORT_DATA(extern const char)   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[];
+WXDLLEXPORT_DATA(extern const char)   wxTreeCtrlNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDirDialogNameStr[];
+WXDLLEXPORT_DATA(extern const char)   wxDirDialogDefaultFolderStr[];
 
 //
 // Class names
@@ -293,7 +288,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 // 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);
-extern HBITMAP wxFlipBmp(HBITMAP hbmp, int w = 0, int h = 0);
+extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0);
 
 // ---------------------------------------------------------------------------
 // global data