X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e2a14e5e30994698f213daf2fc9e3d897846f4d..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/private.h diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index c8064639aa..2dc0f10f7f 100644 --- 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 @@ -94,7 +95,6 @@ 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[]; @@ -103,21 +103,16 @@ 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) wxStaticLineNameStr[]; 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[]; @@ -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