From: Włodzimierz Skiba Date: Fri, 21 Jan 2005 18:48:22 +0000 (+0000) Subject: Warning fixes for MinGW. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210 Warning fixes for MinGW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/accel.h b/include/wx/accel.h index 262595461f..f7bf3b53fd 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -128,7 +128,7 @@ private: #include "wx/os2/accel.h" #endif -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 54a38c4322..1bc0a1239b 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -19,7 +19,7 @@ #include "wx/bitmap.h" #include "wx/button.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. diff --git a/include/wx/button.h b/include/wx/button.h index 66c31c5a47..0ccb8d2deb 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -47,7 +47,7 @@ class WXDLLEXPORT wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; // ---------------------------------------------------------------------------- // wxButton: a push button diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 7ed44aaefc..93e59fa1a3 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -49,7 +49,7 @@ enum wxCheckBoxState }; -WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked diff --git a/include/wx/choice.h b/include/wx/choice.h index 43c3846744..47f7426051 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -28,7 +28,7 @@ // global data // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxChoiceNameStr; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 2f2050d573..578801b858 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -16,7 +16,7 @@ #if wxUSE_COMBOBOX -WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxComboBoxNameStr; // ---------------------------------------------------------------------------- // wxComboBoxBase: this interface defines the methods wxComboBox must implement diff --git a/include/wx/control.h b/include/wx/control.h index 2df5ef5fa3..98905ebe3e 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -26,7 +26,7 @@ #include "wx/window.h" // base class -WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxControlNameStr; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls diff --git a/include/wx/db.h b/include/wx/db.h index 7fba228c9a..ff093f52e5 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -123,8 +123,8 @@ enum enumDummy {enumDum1}; const int wxDB_PATH_MAX = 254; -WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_LOG_FILENAME; -WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_CATALOG_FILENAME; +extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; +extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_CATALOG_FILENAME; // Database Globals const int DB_TYPE_NAME_LEN = 40; @@ -473,7 +473,7 @@ enum wxDBMS // will overwrite the errors of the previously destroyed wxDb object in // this variable. -WXDLLIMPEXP_DATA_ODBC(extern wxChar) +extern WXDLLIMPEXP_DATA_ODBC(wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; diff --git a/include/wx/dc.h b/include/wx/dc.h index 3546f82a1d..6deddb04f9 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -97,7 +97,7 @@ protected: // global variables // --------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern int) wxPageNumber; +extern WXDLLEXPORT_DATA(int) wxPageNumber; // --------------------------------------------------------------------------- // wxDC is the device context - object on which any drawing is done diff --git a/include/wx/debug.h b/include/wx/debug.h index f0ca48d9fc..f6f3242e95 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -127,7 +127,7 @@ #ifdef __cplusplus /* Use of wxFalse instead of false suppresses compiler warnings about testing */ /* constant expression */ - WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse; + extern WXDLLIMPEXP_DATA_BASE(const bool) wxFalse; #endif #define wxAssertFailure wxFalse diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 17dc6c0ac1..ec8bfb2cec 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -35,7 +35,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer; # define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX) #endif -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 83c9ed5ea8..c1d0a50fd4 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -9,9 +9,9 @@ // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr; #define wxDD_DEFAULT_STYLE \ (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON) diff --git a/include/wx/display.h b/include/wx/display.h index b85a04471c..99423b6479 100644 --- a/include/wx/display.h +++ b/include/wx/display.h @@ -29,7 +29,7 @@ class WXDLLEXPORT wxString; WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes); // default, uninitialized, video mode object -WXDLLEXPORT_DATA(extern const wxVideoMode) wxDefaultVideoMode; +extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode; // ---------------------------------------------------------------------------- // wxDisplayBase: represents a display/monitor attached to the system diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index cf4e3bf087..2a1892ecde 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -38,8 +38,8 @@ enum wxCHANGE_DIR = 0x0040 }; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr; //---------------------------------------------------------------------------- // wxFileDialogBase diff --git a/include/wx/frame.h b/include/wx/frame.h index f0389d447e..9caf869e96 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -23,9 +23,9 @@ #include "wx/toplevel.h" // the base class // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxMenuBar; diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 74e55c38c6..9738d8ab7c 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -36,7 +36,7 @@ #define wxGA_PROGRESSBAR 0 -WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr; // ---------------------------------------------------------------------------- // wxGauge: a progress bar diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index b0df2a9cc5..b1667bcc3a 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -76,7 +76,7 @@ private: }; -WXDLLEXPORT_DATA(extern const wxGBSpan) wxDefaultSpan; +extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan; //--------------------------------------------------------------------------- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 10e7b6b5ee..a454155616 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -529,71 +529,71 @@ public: // --------------------------------------------------------------------------- // Lists of GDI objects -WXDLLEXPORT_DATA(extern wxPenList*) wxThePenList; -WXDLLEXPORT_DATA(extern wxBrushList*) wxTheBrushList; -WXDLLEXPORT_DATA(extern wxFontList*) wxTheFontList; -WXDLLEXPORT_DATA(extern wxBitmapList*) wxTheBitmapList; +extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList; +extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; +extern WXDLLEXPORT_DATA(wxFontList*) wxTheFontList; +extern WXDLLEXPORT_DATA(wxBitmapList*) wxTheBitmapList; // Stock objects -WXDLLEXPORT_DATA(extern wxFont*) wxNORMAL_FONT; -WXDLLEXPORT_DATA(extern wxFont*) wxSMALL_FONT; -WXDLLEXPORT_DATA(extern wxFont*) wxITALIC_FONT; -WXDLLEXPORT_DATA(extern wxFont*) wxSWISS_FONT; - -WXDLLEXPORT_DATA(extern wxPen*) wxRED_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxCYAN_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxGREEN_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxBLACK_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxWHITE_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxTRANSPARENT_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxBLACK_DASHED_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxGREY_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxMEDIUM_GREY_PEN; -WXDLLEXPORT_DATA(extern wxPen*) wxLIGHT_GREY_PEN; - -WXDLLEXPORT_DATA(extern wxBrush*) wxBLUE_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxGREEN_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxWHITE_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxBLACK_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxGREY_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxMEDIUM_GREY_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxLIGHT_GREY_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxTRANSPARENT_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxCYAN_BRUSH; -WXDLLEXPORT_DATA(extern wxBrush*) wxRED_BRUSH; - -WXDLLEXPORT_DATA(extern wxColour*) wxBLACK; -WXDLLEXPORT_DATA(extern wxColour*) wxWHITE; -WXDLLEXPORT_DATA(extern wxColour*) wxRED; -WXDLLEXPORT_DATA(extern wxColour*) wxBLUE; -WXDLLEXPORT_DATA(extern wxColour*) wxGREEN; -WXDLLEXPORT_DATA(extern wxColour*) wxCYAN; -WXDLLEXPORT_DATA(extern wxColour*) wxLIGHT_GREY; +extern WXDLLEXPORT_DATA(wxFont*) wxNORMAL_FONT; +extern WXDLLEXPORT_DATA(wxFont*) wxSMALL_FONT; +extern WXDLLEXPORT_DATA(wxFont*) wxITALIC_FONT; +extern WXDLLEXPORT_DATA(wxFont*) wxSWISS_FONT; + +extern WXDLLEXPORT_DATA(wxPen*) wxRED_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxCYAN_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxGREEN_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxBLACK_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxWHITE_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxTRANSPARENT_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxBLACK_DASHED_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxGREY_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxMEDIUM_GREY_PEN; +extern WXDLLEXPORT_DATA(wxPen*) wxLIGHT_GREY_PEN; + +extern WXDLLEXPORT_DATA(wxBrush*) wxBLUE_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxGREEN_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxWHITE_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxBLACK_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxGREY_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxMEDIUM_GREY_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxLIGHT_GREY_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxTRANSPARENT_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxCYAN_BRUSH; +extern WXDLLEXPORT_DATA(wxBrush*) wxRED_BRUSH; + +extern WXDLLEXPORT_DATA(wxColour*) wxBLACK; +extern WXDLLEXPORT_DATA(wxColour*) wxWHITE; +extern WXDLLEXPORT_DATA(wxColour*) wxRED; +extern WXDLLEXPORT_DATA(wxColour*) wxBLUE; +extern WXDLLEXPORT_DATA(wxColour*) wxGREEN; +extern WXDLLEXPORT_DATA(wxColour*) wxCYAN; +extern WXDLLEXPORT_DATA(wxColour*) wxLIGHT_GREY; // 'Null' objects -WXDLLEXPORT_DATA(extern wxBitmap) wxNullBitmap; -WXDLLEXPORT_DATA(extern wxIcon) wxNullIcon; -WXDLLEXPORT_DATA(extern wxCursor) wxNullCursor; -WXDLLEXPORT_DATA(extern wxPen) wxNullPen; -WXDLLEXPORT_DATA(extern wxBrush) wxNullBrush; -WXDLLEXPORT_DATA(extern wxPalette) wxNullPalette; -WXDLLEXPORT_DATA(extern wxFont) wxNullFont; -WXDLLEXPORT_DATA(extern wxColour) wxNullColour; +extern WXDLLEXPORT_DATA(wxBitmap) wxNullBitmap; +extern WXDLLEXPORT_DATA(wxIcon) wxNullIcon; +extern WXDLLEXPORT_DATA(wxCursor) wxNullCursor; +extern WXDLLEXPORT_DATA(wxPen) wxNullPen; +extern WXDLLEXPORT_DATA(wxBrush) wxNullBrush; +extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette; +extern WXDLLEXPORT_DATA(wxFont) wxNullFont; +extern WXDLLEXPORT_DATA(wxColour) wxNullColour; // Stock cursors types -WXDLLEXPORT_DATA(extern wxCursor*) wxSTANDARD_CURSOR; -WXDLLEXPORT_DATA(extern wxCursor*) wxHOURGLASS_CURSOR; -WXDLLEXPORT_DATA(extern wxCursor*) wxCROSS_CURSOR; +extern WXDLLEXPORT_DATA(wxCursor*) wxSTANDARD_CURSOR; +extern WXDLLEXPORT_DATA(wxCursor*) wxHOURGLASS_CURSOR; +extern WXDLLEXPORT_DATA(wxCursor*) wxCROSS_CURSOR; -WXDLLEXPORT_DATA(extern wxColourDatabase*) wxTheColourDatabase; +extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; -WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize; -WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition; +extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; +extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; // The list of objects which should be deleted -WXDLLEXPORT_DATA(extern wxList) wxPendingDelete; +extern WXDLLEXPORT_DATA(wxList) wxPendingDelete; // --------------------------------------------------------------------------- // global functions diff --git a/include/wx/image.h b/include/wx/image.h index ceaad75c96..6fb884955b 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -220,10 +220,10 @@ public: // draw grey values on the black background although they // actually mean to draw white with differnt alpha values. // This method reverses it, assuming a black (!) background - // and white text (actually only the red channel is read). + // and white text (actually only the red channel is read). // The method will then fill up the whole image with the // colour given. - bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ); + bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ); static bool CanRead( const wxString& name ); static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY ); @@ -330,7 +330,7 @@ private: extern void WXDLLEXPORT wxInitAllImageHandlers(); -WXDLLEXPORT_DATA(extern wxImage) wxNullImage; +extern WXDLLEXPORT_DATA(wxImage) wxNullImage; //----------------------------------------------------------------------------- // wxImage handlers diff --git a/include/wx/list.h b/include/wx/list.h index a9da690450..3b857ef271 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -307,7 +307,7 @@ private: // wxNodeBase class is a (base for) node in a double linked list // ----------------------------------------------------------------------------- -WXDLLIMPEXP_DATA_BASE(extern wxListKey) wxDefaultListKey; +extern WXDLLIMPEXP_DATA_BASE(wxListKey) wxDefaultListKey; class WXDLLIMPEXP_BASE wxListBase; diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 0f083697c7..53248094f3 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_BASE wxArrayString; // global data // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr; // ---------------------------------------------------------------------------- // wxListBox interface is defined by the class wxListBoxBase diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index 9c289e604c..fbf05abb9c 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -26,7 +26,7 @@ // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxListCtrlNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr; // ---------------------------------------------------------------------------- // include the wxListCtrl class declaration diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index ced6b00150..b398d8c974 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -98,7 +98,7 @@ public: wxFileTypeInfo() { } // test if this object can be used - bool IsValid() const { return !m_mimeType.IsEmpty(); } + bool IsValid() const { return !m_mimeType.empty(); } // setters // set the icon info @@ -388,7 +388,7 @@ private: // ---------------------------------------------------------------------------- // the default mime manager for wxWidgets programs -WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager; +extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager; #endif // wxUSE_MIMETYPE diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 0ba429a919..3160358587 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -41,7 +41,7 @@ enum typedef wxWindow wxNotebookPage; // so far, any window can be a page -WXDLLEXPORT_DATA(extern const wxChar*) wxNotebookNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxNotebookNameStr; #if WXWIN_COMPATIBILITY_2_4 #define wxNOTEBOOK_NAME wxNotebookNameStr diff --git a/include/wx/paper.h b/include/wx/paper.h index 6e5a8983c8..86fdafcc90 100644 --- a/include/wx/paper.h +++ b/include/wx/paper.h @@ -119,7 +119,7 @@ private: // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase) }; -WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase; +extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase; #endif diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index 51721888f2..fa3db009e4 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -20,7 +20,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr; // ---------------------------------------------------------------------------- // wxRadioBoxBase is not a normal base class, but rather a mix-in because the diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h index 9f226a0854..5b086935e5 100644 --- a/include/wx/radiobut.h +++ b/include/wx/radiobut.h @@ -31,7 +31,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxRadioButtonNameStr; #if defined(__WXUNIVERSAL__) #include "wx/univ/radiobut.h" diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index cb2a29559b..c9272e99dd 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -5,7 +5,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control diff --git a/include/wx/slider.h b/include/wx/slider.h index 1ed1aa749f..257e8bde8f 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -22,7 +22,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 7eb8a31b73..e0e4566370 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl diff --git a/include/wx/statbox.h b/include/wx/statbox.h index c286ad829d..78690c41a0 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -5,7 +5,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr; // ---------------------------------------------------------------------------- // wxStaticBox: a grouping box with a label diff --git a/include/wx/statline.h b/include/wx/statline.h index c0ccedc762..e472503747 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -28,7 +28,7 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr; // ---------------------------------------------------------------------------- // wxStaticLine - a line in a dialog diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 979152cb16..19d2e00182 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -5,7 +5,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr; class WXDLLEXPORT wxStaticTextBase : public wxControl { diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 72423f8c77..cf4dc62ff3 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -89,7 +89,7 @@ public: // not very accurately named because it is not necessarily of type wxMBConvLibc // (but the name can't eb changed because of backwards compatibility) default // conversion -WXDLLIMPEXP_DATA_BASE(extern wxMBConv&) wxConvLibc; +extern WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc; // ---------------------------------------------------------------------------- // wxMBConvUTF7 (for conversion using UTF7 encoding) @@ -102,7 +102,7 @@ public: virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; }; -WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF7&) wxConvUTF7; +extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7; // ---------------------------------------------------------------------------- // wxMBConvUTF8 (for conversion using UTF8 encoding) @@ -115,7 +115,7 @@ public: virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; }; -WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF8&) wxConvUTF8; +extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8; // ---------------------------------------------------------------------------- // wxMBConvUTF16LE (for conversion using UTF16 Little Endian encoding) @@ -216,9 +216,9 @@ private: #define wxConvFile wxConvLocal #endif -WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvLocal; -WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvISO8859_1; -WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent; +extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal; +extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1; +extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent; // ---------------------------------------------------------------------------- // endianness-dependent conversions @@ -271,11 +271,11 @@ public: #define wxConvFile wxConvLocal -WXDLLIMPEXP_DATA_BASE(extern wxMBConv) wxConvLibc, +extern WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc, wxConvLocal, wxConvISO8859_1, wxConvUTF8; -WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent; +extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent; #define wxFNCONV(name) name #define wxFNSTRINGCAST WXSTRINGCAST diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 24b2c66dbb..83864fe277 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -36,9 +36,9 @@ class WXDLLEXPORT wxImage; // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; -WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize; -WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition; +extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; +extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; +extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; enum wxToolBarToolStyle { diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index a944b5d8ba..652b38e595 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -68,7 +68,7 @@ typedef long wxTextCoord; // constants // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxTextCtrlNameStr; // this is intentionally not enum to avoid warning fixes with // typecasting from enum type to wxTextCoord diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 64e9384a99..bfbe0ac8e4 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -26,7 +26,7 @@ #include "wx/iconbndl.h" // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; class WXDLLEXPORT wxTopLevelWindowBase; diff --git a/include/wx/treebase.h b/include/wx/treebase.h index 7bdc2d2a29..5ca616edd8 100644 --- a/include/wx/treebase.h +++ b/include/wx/treebase.h @@ -201,7 +201,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL; // tree ctrl default name -WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxTreeCtrlNameStr; // ---------------------------------------------------------------------------- // wxTreeItemAttr: a structure containing the visual attributes of an item diff --git a/include/wx/utils.h b/include/wx/utils.h index 38bade0974..30b4b59816 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -143,8 +143,8 @@ WXDLLEXPORT long wxGetCurrentId(); // these functions are deprecated, use wxString methods instead! #if WXWIN_COMPATIBILITY_2_4 -WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxFloatToStringStr; -WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxDoubleToStringStr; +extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxFloatToStringStr; +extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDoubleToStringStr; wxDEPRECATED( WXDLLIMPEXP_BASE void StringToFloat(const wxChar *s, float *number) ); wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* FloatToString(float number, const wxChar *fmt = wxFloatToStringStr) ); @@ -456,7 +456,7 @@ private: // Set the cursor to the busy cursor for all windows class WXDLLEXPORT wxCursor; -WXDLLEXPORT_DATA(extern wxCursor*) wxHOURGLASS_CURSOR; +extern WXDLLEXPORT_DATA(wxCursor*) wxHOURGLASS_CURSOR; WXDLLEXPORT void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR); // Restore cursor to normal @@ -505,7 +505,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y ); // MSW only: get user-defined resource from the .res file. // Returns NULL or newly-allocated memory, so use delete[] to clean up. #ifdef __WXMSW__ - WXDLLEXPORT extern const wxChar* wxUserResourceStr; + extern WXDLLEXPORT const wxChar* wxUserResourceStr; WXDLLEXPORT wxChar* wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr); #endif // MSW @@ -559,11 +559,11 @@ WXDLLIMPEXP_BASE bool wxYieldIfNeeded(); wxDEPRECATED( WXDLLIMPEXP_BASE void wxDebugMsg(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1 ); // Non-fatal error (continues) -WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxInternalErrorStr; +extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxInternalErrorStr; wxDEPRECATED( WXDLLIMPEXP_BASE void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr) ); // Fatal error (exits) -WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxFatalErrorStr; +extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxFatalErrorStr; wxDEPRECATED( WXDLLIMPEXP_BASE void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr) ); #endif // WXWIN_COMPATIBILITY_2_2 diff --git a/include/wx/validate.h b/include/wx/validate.h index 59dcf2ad14..de2bbff03c 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -81,7 +81,7 @@ private: DECLARE_NO_COPY_CLASS(wxValidator) }; -WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator; +extern WXDLLEXPORT_DATA(const wxValidator) wxDefaultValidator; #define wxVALIDATOR_PARAM(val) val diff --git a/include/wx/window.h b/include/wx/window.h index fb7e781ac3..bb2c943204 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -116,7 +116,7 @@ WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class // global variables // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern wxWindowList) wxTopLevelWindows; +extern WXDLLEXPORT_DATA(wxWindowList) wxTopLevelWindows; // ---------------------------------------------------------------------------- // wxWindowBase is the base class for all GUI controls/widgets, this is the public @@ -1408,13 +1408,13 @@ inline wxWindow *wxWindowBase::GetGrandParent() const // Find the wxWindow at the current mouse position, also returning the mouse // position. -WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt); +extern WXDLLEXPORT wxWindow* wxFindWindowAtPointer(wxPoint& pt); // Get the current mouse position. -WXDLLEXPORT extern wxPoint wxGetMousePosition(); +extern WXDLLEXPORT wxPoint wxGetMousePosition(); // get the currently active window of this application or NULL -WXDLLEXPORT extern wxWindow *wxGetActiveWindow(); +extern WXDLLEXPORT wxWindow *wxGetActiveWindow(); // get the (first) top level parent window WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win);