substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
#include "wx/cmndata.h"
|
||||
|
||||
|
||||
class WXDLLEXPORT wxColourDialog : public wxDialog
|
||||
class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
|
||||
{
|
||||
public:
|
||||
wxColourDialog() {}
|
||||
|
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
|
||||
extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
|
||||
extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMDIParentFrame
|
||||
|
@@ -18,9 +18,9 @@
|
||||
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
|
||||
// Returns wxYES/NO/OK/CANCEL
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
|
||||
WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxMessageBoxCaptionStr[];
|
||||
|
||||
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
|
||||
class WXDLLIMPEXP_CORE wxMessageDialog: public wxDialog, public wxMessageDialogBase
|
||||
{
|
||||
public:
|
||||
wxMessageDialog(wxWindow *parent, const wxString& message,
|
||||
|
@@ -16,7 +16,7 @@
|
||||
// wxScrolledWindow
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxScrollHelperNative : public wxScrollHelper
|
||||
class WXDLLIMPEXP_CORE wxScrollHelperNative : public wxScrollHelper
|
||||
{
|
||||
public:
|
||||
// default ctor doesn't do anything
|
||||
|
@@ -76,7 +76,7 @@ static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON |
|
||||
// just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the
|
||||
// application.
|
||||
// ----------------------------------------------------------------------------
|
||||
class WXDLLEXPORT wxTreeItemId {
|
||||
class WXDLLIMPEXP_CORE wxTreeItemId {
|
||||
public:
|
||||
// ctors
|
||||
wxTreeItemId() { m_itemId = NULL; }
|
||||
@@ -113,7 +113,7 @@ protected:
|
||||
// Because the objects of this class are deleted by the tree, they should
|
||||
// always be allocated on the heap!
|
||||
// ----------------------------------------------------------------------------
|
||||
class WXDLLEXPORT wxTreeItemData : private wxTreeItemId {
|
||||
class WXDLLIMPEXP_CORE wxTreeItemData : private wxTreeItemId {
|
||||
public:
|
||||
// default ctor/copy ctor/assignment operator are ok
|
||||
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; }
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxTreeCtrl: public wxControl {
|
||||
class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl {
|
||||
public:
|
||||
// creation
|
||||
// --------
|
||||
|
Reference in New Issue
Block a user