Warning fixes for MinGW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
eba52a286d
commit
f4fffffc95
@ -285,7 +285,7 @@ protected:
|
||||
};
|
||||
|
||||
// The global fileicons table
|
||||
WXDLLEXPORT_DATA(extern wxFileIconsTable *) wxTheFileIconsTable;
|
||||
extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
|
||||
|
||||
#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user