X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e2a14e5e30994698f213daf2fc9e3d897846f4d..05a98b6d5d201eb8edea04b1ab022e4a9a46e9f0:/include/wx/os2/private.h?ds=sidebyside diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index c8064639aa..a453f8b02d 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 @@ -79,7 +80,7 @@ class WXDLLEXPORT wxFont; class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_BASE wxString; class WXDLLEXPORT wxBitmap; // --------------------------------------------------------------------------- @@ -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[]; @@ -105,19 +105,13 @@ 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[];