AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put storage class outside WXDLLIMPEXP_DATA_CORE() macros.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2011-02-22 13:25:51 +00:00
parent 58d424d7e1
commit b8b9e48c51
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk1/msgdlg.h
View File

@ -18,7 +18,7 @@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL // 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 class WXDLLIMPEXP_CORE wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

2
include/wx/motif/accel.h
View File

@ -34,7 +34,7 @@ public:
wxAcceleratorEntry* GetEntries() const; wxAcceleratorEntry* GetEntries() const;
}; };
WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
#endif #endif
// _WX_ACCEL_H_ // _WX_ACCEL_H_

2
include/wx/msgdlg.h
View File

@ -19,7 +19,7 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/stockitem.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 // wxMessageDialogBase: base class defining wxMessageDialog interface