From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Fri, 21 Jan 2005 18:26:01 +0000 (+0000)
Subject: Warning fixes for MinGW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f4fffffc953f68af6c968419da446a9b2e536693

Warning fixes for MinGW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 5a67406f7b..66cd52bc62 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -285,7 +285,7 @@ protected:
 };
 
 // The global fileicons table
-WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable;
+extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
 
 #endif // wxUSE_DIRDLG || wxUSE_FILEDLG
 
diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 3133ca5ab6..9453d84505 100644
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -24,8 +24,8 @@ class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
 #ifndef wxDD_DEFAULT_STYLE
     #define wxDD_DEFAULT_STYLE \
         (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 243a7c575f..6b7ea2b6da 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -24,8 +24,8 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
 
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 01022ecdc4..74f55850b4 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -22,7 +22,7 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
 {
diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 5be10c37d4..75c666f08e 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -25,7 +25,7 @@
 
 class WXDLLEXPORT wxControlContainer;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 // ----------------------------------------------------------------------------
 // wxPanel contains other controls and implements TAB traversal between them
diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 88ef181e6b..698e8bd824 100644
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -23,7 +23,7 @@
 #include "wx/window.h"
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
 #ifndef wxScrolledWindowStyle
@@ -72,7 +72,7 @@ public:
     virtual void DoSetVirtualSize(int x, int y);
 
 #ifdef __WXMAC__
-	virtual bool MacClipChildren() const { return true ; }
+    virtual bool MacClipChildren() const { return true ; }
 #endif
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 63ed0802c3..08e2e6ae63 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -21,7 +21,7 @@
 #include "wx/statusbr.h"
 #include "wx/arrstr.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 46883085ab..642dd0e9fe 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -27,8 +27,8 @@
 
 class WXDLLEXPORT wxTextCtrl;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxGetPasswordFromUserPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxGetTextFromUserPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr;
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)