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 262595461ff6f8b65cade3f80bfedebd32b9ff5f..f7bf3b53fd60ad70d5196dac1a1d2061787b1759 100644 (file)
--- 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 54a38c432248daccb7db01d3e98db7b11a94d8e6..1bc0a1239ba05fb5315a9efc0de985d9ccbb44cb 100644 (file)
--- 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 66c31c5a479350bcae7e01d8c7615e2e1f08b1c8..0ccb8d2deb59816d224d3894c147baf826d79778 100644 (file)
--- 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 7ed44aaefc093ceb42ad8b52c68283646bfc1bcb..93e59fa1a3c19f45f1078bedf4ea9368a6ed5a87 100644 (file)
--- 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 43c3846744c083533700ea784e7857fba27cb0ab..47f742605189e407c79859b42c13882a4ee48db2 100644 (file)
--- 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 2f2050d573ab96cd37ac69ef8c1d55061a1ab64a..578801b858e189f8991e038cc4657c9f7990757f 100644 (file)
--- 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 2df5ef5fa345a7883693a02d3789dc0f523ce67c..98905ebe3ef8913ff2214a7be30d826feda0c6cc 100644 (file)
--- 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 7fba228c9afda8fcf822ca70b520a564f42d9b6c..ff093f52e54a512bf1fd155af184f53f33c8b2bc 100644 (file)
--- 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 3546f82a1dd20eacc4ba9ac36a64f2161b8e6dad..6deddb04f9606aa85fff8d8eb0cbaf5669477cd2 100644 (file)
--- 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 f0ca48d9fc12701b63438d7e6ec620bf00c0f521..f6f3242e957ce5bd91bda65de2afcfdd50d292c7 100644 (file)
--- 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 17dc6c0ac110873b788606fd0265cd83135c45a9..ec8bfb2cec13968eca54039926e2d11439feec2c 100644 (file)
--- 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 83c9ed5ea839e8e1cc6e8bd8b0725e47a19d819a..c1d0a50fd4d5e2f7fb8605eae728f02f6d21d5e9 100644 (file)
--- 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 b85a04471c4936c080cff0d166cb455a5dfd46c1..99423b6479757465e9da2c10af87384d5228e851 100644 (file)
--- 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 cf4e3bf0872f7575c4d3c4ce9fd1766ae358cc90..2a1892ecde971dd78f0d4ba1c4bf233c909a2771 100644 (file)
--- 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 f0389d447e91afbe1ef19d95e0fa429c7e464094..9caf869e9642a16fc8ccf68c094cac4839ff0235 100644 (file)
--- 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 74e55c38c6e72ede79a2df484f80692fa7d1512e..9738d8ab7c32f45a2d03ec9afff9d5600971be4b 100644 (file)
--- 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 b0df2a9cc571ae2a4a6dfc9da3695850c4e543ca..b1667bcc3a6ce658aead9c198d4bb4f66b4592fd 100644 (file)
--- 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 10e7b6b5ee7b10395f5d5b014cc6a16109d39075..a4541556166fb8025c444614c42f329f9028c0a4 100644 (file)
--- 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 ceaad75c960d0f3628ba636e0100e1e10849cf57..6fb884955b062e61ec306cf1a72bd836aafffd03 100644 (file)
--- 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 a9da690450a9fc5f2063435c3979efa2294d3982..3b857ef2718931c4caa910f30ee6c53e66339d9a 100644 (file)
--- 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 0f083697c76f6b1d9fb549c2908e47f2962e9f66..53248094f39f091abd627c5996a7dd7b2ce794c2 100644 (file)
--- 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 9c289e604c0625a5899ee365a81f1659c49ed25e..fbf05abb9cefbedcd9ffeee369b159ee82bc30fe 100644 (file)
--- 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 ced6b00150364651f2902f111bd1801e22db99c1..b398d8c9742bf1f87fa2740d0cde11d61e12232a 100644 (file)
--- 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 0ba429a919970622305c5f33f06c4da5b04b12c0..3160358587f11b720fe9834873a8dfa24bc3d1c2 100644 (file)
--- 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 6e5a8983c8bf1440411d6b884eb1484fbc9016ce..86fdafcc900fb2262bf75f462f5927b8470853bc 100644 (file)
--- 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 51721888f2ff7e4c85bf1e0c1d1975226f8bcc90..fa3db009e4f064f1c3ac0f94f88baa30e3009457 100644 (file)
--- 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 9f226a08548a9df78ced2f9d3e670db6f39b6aa6..5b086935e58c6e946fbdfa4fe1aa71dccfcb78b2 100644 (file)
--- 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 cb2a29559beefeaad202e6751206599ea310a364..c9272e99dd0e7cb3634405b8c7d9baadb10da37b 100644 (file)
--- 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 1ed1aa749f9d4f6768d0ac0994f6f367e4f32351..257e8bde8fd21f48c62832072cd5ad2d1d0fe58b 100644 (file)
--- 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 7eb8a31b73331ee8d72cb029554c1a0ae0dc58eb..e0e4566370a49248554c847975c496014cb55fee 100644 (file)
--- 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 c286ad829db4ab4e6a63769785de6e1237ecc7bd..78690c41a0b60bb1b79733a7c6cdf5300006345b 100644 (file)
--- 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 c0ccedc762324ccd37c6a94869ad451d9177a39f..e47250374713a0dc931657eba173f928b0a012b3 100644 (file)
--- 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 979152cb16eaa35a79367d5b6ab31bcd9e680fec..19d2e00182148f6dc391115e60afb3fa5f8721c3 100644 (file)
--- 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 72423f8c771bc6602da17812d8e6d37b2b585819..cf4dc62ff372cc3e078d3307fe5d0a7835c91565 100644 (file)
--- 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 24b2c66dbb214a7be970451ac430848741968558..83864fe2777776130d8e17e794ddb8c62a6daf59 100644 (file)
--- 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 a944b5d8baf01d29710b815685d7275e57c58aaf..652b38e595e20b017d008d0bc47b79550af3caad 100644 (file)
--- 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 64e9384a99ae23f6eed3f9adecf6fde4827c005f..bfbe0ac8e46320381d191642bd0e967ce2a6ff9c 100644 (file)
--- 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 7bdc2d2a296cb2270d35c44ec1c6d966779f2805..5ca616edd83e1077606ff6b2be1191689c048ee9 100644 (file)
--- 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 38bade09743f35c1d65bd3411ee5cfbfde151fbc..30b4b59816168243d6a59ddb11a9e9e15c90b6a0 100644 (file)
--- 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 59dcf2ad143b607131eac9bfff0f750f5b90e917..de2bbff03cf31228cf019ef7dac96d9a40e63264 100644 (file)
--- 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 fb7e781ac3f50279a48b36f85b3a24080bc060a4..bb2c9432041df1d1f6056f21294cacf0bbfa4690 100644 (file)
--- 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);