Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fixes for MinGW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-21 18:48:22 +00:00
parent f4fffffc95
commit 16cba29d3a
41 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/accel.h
View File

@@ -128,7 +128,7 @@ private:
#include "wx/os2/accel.h"
#endif
WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable;
#endif // wxUSE_ACCEL

2
include/wx/bmpbuttn.h
View File

@@ -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.

2
include/wx/button.h
View File

@@ -47,7 +47,7 @@
class WXDLLEXPORT wxBitmap;
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
// ----------------------------------------------------------------------------
// wxButton: a push button

2
include/wx/checkbox.h
View File

@@ -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

2
include/wx/choice.h
View File

@@ -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

2
include/wx/combobox.h
View File

@@ -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

2
include/wx/control.h
View File

@@ -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

6
include/wx/db.h
View File

@@ -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];

2
include/wx/dc.h
View File

@@ -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

2
include/wx/debug.h
View File

@@ -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

2
include/wx/dialog.h
View File

@@ -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
{

6
include/wx/dirdlg.h
View File

@@ -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)

2
include/wx/display.h
View File

@@ -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

4
include/wx/filedlg.h
View File

@@ -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

6
include/wx/frame.h
View File

@@ -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;

2
include/wx/gauge.h
View File

@@ -36,7 +36,7 @@
#define wxGA_PROGRESSBAR 0
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
// ----------------------------------------------------------------------------
// wxGauge: a progress bar

2
include/wx/gbsizer.h
View File

@@ -76,7 +76,7 @@ private:
};
WXDLLEXPORT_DATA(extern const wxGBSpan) wxDefaultSpan;
extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
//---------------------------------------------------------------------------

102
include/wx/gdicmn.h
View File

@@ -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;
extern WXDLLEXPORT_DATA(wxFont*) wxNORMAL_FONT;
extern WXDLLEXPORT_DATA(wxFont*) wxSMALL_FONT;
extern WXDLLEXPORT_DATA(wxFont*) wxITALIC_FONT;
extern WXDLLEXPORT_DATA(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;
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;
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;
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;
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(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

2
include/wx/image.h
View File

@@ -330,7 +330,7 @@ private:
extern void WXDLLEXPORT wxInitAllImageHandlers();
WXDLLEXPORT_DATA(extern wxImage) wxNullImage;
extern WXDLLEXPORT_DATA(wxImage) wxNullImage;
//-----------------------------------------------------------------------------
// wxImage handlers

2
include/wx/list.h
View File

@@ -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;

2
include/wx/listbox.h
View File

@@ -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

2
include/wx/listctrl.h
View File

@@ -26,7 +26,7 @@
// constants
// ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern const wxChar*) wxListCtrlNameStr;
extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr;
// ----------------------------------------------------------------------------
// include the wxListCtrl class declaration

4
include/wx/mimetype.h
View File

@@ -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

2
include/wx/notebook.h
View File

@@ -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

2
include/wx/paper.h
View File

@@ -119,7 +119,7 @@ private:
// DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
};
WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
#endif

2
include/wx/radiobox.h
View File

@@ -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

2
include/wx/radiobut.h
View File

@@ -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"

2
include/wx/scrolbar.h
View File

@@ -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

2
include/wx/slider.h
View File

@@ -22,7 +22,7 @@
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
// ----------------------------------------------------------------------------
// wxSliderBase: define wxSlider interface

2
include/wx/statbmp.h
View File

@@ -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

2
include/wx/statbox.h
View File

@@ -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

2
include/wx/statline.h
View File

@@ -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

2
include/wx/stattext.h
View File

@@ -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
{

16
include/wx/strconv.h
View File

@@ -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

6
include/wx/tbarbase.h
View File

@@ -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
{

2
include/wx/textctrl.h
View File

@@ -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

2
include/wx/toplevel.h
View File

@@ -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;

2
include/wx/treebase.h
View File

@@ -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

12
include/wx/utils.h
View File

@@ -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

2
include/wx/validate.h
View File

@@ -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

8
include/wx/window.h
View File

@@ -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);