Put storage class outside WXDLLIMPEXP_DATA_CORE() macros.

The storage class must come first in a declaration so put it in front of
WXDLLIMPEXP_DATA_CORE() and not inside it to avoid warnings from some
compilers (notably Intel one).

Closes #12932.

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

diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 90a80811b56688ed310d23a49cfd25dfe8a28288..e3436cb91219acbae697d198ebdaadfbd5d4e2f2 100644 (file)
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -18,7 +18,7 @@
 // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
 // Returns wxYES/NO/OK/CANCEL
 
-WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxMessageBoxCaptionStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxMessageBoxCaptionStr[];
 
 class WXDLLIMPEXP_CORE wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 5ae1a3a2fabf0e4a239bdc79952929c3df811004..fb90ecb0b0a734b046b22cfef390a66a1e3053ce 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -34,7 +34,7 @@ public:
     wxAcceleratorEntry* GetEntries() const;
 };
 
-WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
 // _WX_ACCEL_H_

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 958e46a782caade794b5f43fdf49e5e998e423fd..04da533c8c8772f1773e536b6f9712832e980cb8 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -19,7 +19,7 @@
 #include "wx/dialog.h"
 #include "wx/stockitem.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxMessageBoxCaptionStr[];
 
 // ----------------------------------------------------------------------------
 // wxMessageDialogBase: base class defining wxMessageDialog interface