added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-09 10:09:52 +00:00
parent 5458b18a18
commit b5dbe15d0b
434 changed files with 1140 additions and 1122 deletions

View File

@@ -17,9 +17,9 @@
#include "wx/dialog.h"
class WXDLLIMPEXP_ADV wxAboutDialogInfo;
class WXDLLIMPEXP_CORE wxSizer;
class WXDLLIMPEXP_CORE wxSizerFlags;
class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
// ----------------------------------------------------------------------------
// wxGenericAboutDialog: generic "About" dialog implementation

View File

@@ -10,7 +10,7 @@
#ifndef _WX_GENERIC_ACCEL_H_
#define _WX_GENERIC_ACCEL_H_
class WXDLLEXPORT wxKeyEvent;
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
// ----------------------------------------------------------------------------
// wxAcceleratorTable

View File

@@ -14,7 +14,7 @@
#if wxUSE_BUSYINFO
class WXDLLIMPEXP_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
//--------------------------------------------------------------------------------
// wxBusyInfo

View File

@@ -16,7 +16,7 @@
#include "wx/bmpbuttn.h"
#include "wx/toolbar.h"
class WXDLLEXPORT wxButtonToolBarTool;
class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool;
// ----------------------------------------------------------------------------
// wxButtonToolBar

View File

@@ -15,9 +15,9 @@
#include "wx/control.h" // the base class
#include "wx/dcclient.h" // for wxPaintDC
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#define wxCalendarNameStr _T("CalendarCtrl")

View File

@@ -20,7 +20,7 @@
#define wxHAS_CARET_USING_OVERLAYS
#endif
class WXDLLIMPEXP_CORE wxCaret;
class WXDLLIMPEXP_FWD_CORE wxCaret;
class WXDLLEXPORT wxCaretTimer : public wxTimer
{

View File

@@ -15,7 +15,7 @@
#include "wx/dynarray.h"
#include "wx/dialog.h"
class WXDLLEXPORT wxListBoxBase;
class WXDLLIMPEXP_FWD_CORE wxListBoxBase;
// ----------------------------------------------------------------------------
// some (ugly...) constants

View File

@@ -13,8 +13,8 @@
#define _WX_COLLAPSABLE_PANE_H_GENERIC_
// forward declared
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticLine;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxStaticLine;
// class name
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

View File

@@ -25,7 +25,7 @@
#define wxID_GREEN_SLIDER 3002
#define wxID_BLUE_SLIDER 3003
class WXDLLEXPORT wxSlider;
class WXDLLIMPEXP_FWD_CORE wxSlider;
#endif // wxUSE_SLIDER

View File

@@ -21,9 +21,9 @@
// classes
// ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewCtrl;
class WXDLLIMPEXP_ADV wxDataViewMainWindow;
class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow;
class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow;
// ---------------------------------------------------------
// wxDataViewRenderer

View File

@@ -12,11 +12,11 @@
#ifndef _WX_GENERIC_DATECTRL_H_
#define _WX_GENERIC_DATECTRL_H_
class WXDLLIMPEXP_ADV wxCalendarDateAttr;
class WXDLLIMPEXP_ADV wxCalendarCtrl;
class WXDLLIMPEXP_ADV wxCalendarEvent;
class WXDLLIMPEXP_ADV wxComboCtrl;
class WXDLLIMPEXP_ADV wxCalendarComboPopup;
class WXDLLIMPEXP_FWD_ADV wxCalendarDateAttr;
class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarEvent;
class WXDLLIMPEXP_FWD_ADV wxComboCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
{

View File

@@ -30,9 +30,9 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_BASE wxHashTable;
//-----------------------------------------------------------------------------
// Extra styles for wxGenericDirCtrl
@@ -78,7 +78,7 @@ public:
// wxDirCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDirFilterListCtrl;
class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
class WXDLLEXPORT wxGenericDirCtrl: public wxControl
{

View File

@@ -15,9 +15,9 @@
#ifndef _WX_DIRDLGG_H_
#define _WX_DIRDLGG_H_
class WXDLLEXPORT wxGenericDirCtrl;
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxTreeEvent;
class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
// we may be included directly as well as from wx/dirdlg.h (FIXME)
extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];

View File

@@ -12,9 +12,9 @@
#ifndef _WX_GENERIC_FDREPDLG_H_
#define _WX_GENERIC_FDREPDLG_H_
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxRadioBox;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxRadioBox;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// ----------------------------------------------------------------------------
// wxGenericFindReplaceDialog: dialog for searching / replacing text

View File

@@ -21,16 +21,16 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxBitmapButton;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxChoice;
class WXDLLEXPORT wxFileData;
class WXDLLEXPORT wxFileCtrl;
class WXDLLEXPORT wxGenericFileDialog;
class WXDLLEXPORT wxListEvent;
class WXDLLEXPORT wxListItem;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxChoice;
class WXDLLIMPEXP_FWD_CORE wxFileData;
class WXDLLIMPEXP_FWD_CORE wxFileCtrl;
class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog;
class WXDLLIMPEXP_FWD_CORE wxListEvent;
class WXDLLIMPEXP_FWD_CORE wxListItem;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
//-------------------------------------------------------------------------
// wxGenericFileDialog

View File

@@ -20,7 +20,7 @@
#ifdef __WXWINCE__
#define USE_SPINCTRL_FOR_POINT_SIZE 1
class WXDLLEXPORT wxSpinEvent;
class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
#else
#define USE_SPINCTRL_FOR_POINT_SIZE 0
#endif
@@ -29,10 +29,10 @@ class WXDLLEXPORT wxSpinEvent;
* FONT DIALOG
*/
class WXDLLEXPORT wxChoice;
class WXDLLEXPORT wxText;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxFontPreviewer;
class WXDLLIMPEXP_FWD_CORE wxChoice;
class WXDLLIMPEXP_FWD_CORE wxText;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxFontPreviewer;
enum
{

View File

@@ -67,21 +67,21 @@ enum wxGridDirection
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxGrid;
class WXDLLIMPEXP_ADV wxGridCellAttr;
class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
class WXDLLIMPEXP_ADV wxGridColLabelWindow;
class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
class WXDLLIMPEXP_ADV wxGridWindow;
class WXDLLIMPEXP_ADV wxGridTypeRegistry;
class WXDLLIMPEXP_ADV wxGridSelection;
class WXDLLIMPEXP_FWD_ADV wxGrid;
class WXDLLIMPEXP_FWD_ADV wxGridCellAttr;
class WXDLLIMPEXP_FWD_ADV wxGridCellAttrProviderData;
class WXDLLIMPEXP_FWD_ADV wxGridColLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridCornerLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridRowLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridWindow;
class WXDLLIMPEXP_FWD_ADV wxGridTypeRegistry;
class WXDLLIMPEXP_FWD_ADV wxGridSelection;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
#if wxUSE_SPINCTRL
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#endif
// ----------------------------------------------------------------------------
@@ -2020,7 +2020,7 @@ protected:
bool GetModelValues();
bool SetModelValues();
friend class WXDLLIMPEXP_ADV wxGridSelection;
friend class WXDLLIMPEXP_FWD_ADV wxGridSelection;
DECLARE_DYNAMIC_CLASS( wxGrid )
DECLARE_EVENT_TABLE()

View File

@@ -79,7 +79,7 @@ private:
wxGrid *m_grid;
wxGrid::wxGridSelectionModes m_selectionMode;
friend class WXDLLIMPEXP_ADV wxGrid;
friend class WXDLLIMPEXP_FWD_ADV wxGrid;
DECLARE_NO_COPY_CLASS(wxGridSelection)
};

View File

@@ -15,9 +15,9 @@
#include "wx/list.h"
#include "wx/icon.h"
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxColour;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLEXPORT wxGenericImageList: public wxObject

View File

@@ -196,8 +196,8 @@ private:
#endif // wxUSE_SASH
class WXDLLEXPORT wxMDIParentFrame;
class WXDLLEXPORT wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
// This class implements the layout algorithm
class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject

View File

@@ -13,10 +13,10 @@
#include "wx/textctrl.h"
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxImageList;
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxDropTarget;
class WXDLLIMPEXP_FWD_CORE wxDropTarget;
#endif
// ----------------------------------------------------------------------------
@@ -28,8 +28,8 @@ class WXDLLEXPORT wxDropTarget;
// internal classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxListHeaderWindow;
class WXDLLEXPORT wxListMainWindow;
class WXDLLIMPEXP_FWD_CORE wxListHeaderWindow;
class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
//-----------------------------------------------------------------------------
// wxListCtrl
@@ -233,7 +233,7 @@ protected:
virtual wxListItemAttr *OnGetItemAttr(long item) const;
// it calls our OnGetXXX() functions
friend class WXDLLEXPORT wxListMainWindow;
friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
private:
// create the header window

View File

@@ -27,9 +27,9 @@ extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericMDIParentFrame;
class WXDLLEXPORT wxGenericMDIClientWindow;
class WXDLLEXPORT wxGenericMDIChildFrame;
class WXDLLIMPEXP_FWD_CORE wxGenericMDIParentFrame;
class WXDLLIMPEXP_FWD_CORE wxGenericMDIClientWindow;
class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame;
//-----------------------------------------------------------------------------
// wxGenericMDIParentFrame

View File

@@ -22,9 +22,9 @@
// ----------------------------------------------------------------------------
// fwd declarations
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxTabView;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxTabView;
// ----------------------------------------------------------------------------
// wxNotebook

View File

@@ -19,9 +19,9 @@
#include "wx/dialog.h"
#if wxUSE_SPINCTRL
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#else
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
#endif // wxUSE_SPINCTRL
// ----------------------------------------------------------------------------

View File

@@ -21,7 +21,7 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxPalette;
class WXDLLIMPEXP_FWD_CORE wxPalette;
//-----------------------------------------------------------------------------
// wxPalette

View File

@@ -19,7 +19,7 @@
#include "wx/window.h"
#include "wx/containr.h"
class WXDLLEXPORT wxControlContainer;
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];

View File

@@ -27,13 +27,13 @@
#include "wx/dcps.h"
#endif
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxRadioBox;
class WXDLLEXPORT wxPageSetupData;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxRadioBox;
class WXDLLIMPEXP_FWD_CORE wxPageSetupData;
// ----------------------------------------------------------------------------
// constants

View File

@@ -19,9 +19,9 @@
#include "wx/dialog.h"
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxGauge;
class WXDLLEXPORT wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxGauge;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
/* Progress dialog which shows a moving progress bar.
Taken from the Mahogany project.*/
@@ -161,7 +161,7 @@ private:
#endif // __WXMSW__
// for wxPD_APP_MODAL case
class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxProgressDialog)

View File

@@ -18,7 +18,7 @@
#include "wx/dialog.h"
class WXDLLIMPEXP_CORE wxBookCtrlBase;
class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
//-----------------------------------------------------------------------------
// wxPropertySheetDialog

View File

@@ -42,7 +42,7 @@ protected:
virtual bool DoSubtract(const wxRegion& region);
virtual bool DoXor(const wxRegion& region);
friend class WXDLLEXPORT wxRegionIteratorGeneric;
friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric;
};
class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject

View File

@@ -22,8 +22,8 @@
#if wxUSE_SPINBTN
class WXDLLEXPORT wxSpinButton;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinButton;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// ----------------------------------------------------------------------------
// wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton

View File

@@ -27,7 +27,7 @@
#define wxSPLASH_TIMEOUT 0x04
#define wxSPLASH_NO_TIMEOUT 0x00
class WXDLLIMPEXP_ADV wxSplashScreenWindow;
class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;
/*
* wxSplashScreen

View File

@@ -15,7 +15,7 @@
#include "wx/window.h" // base class declaration
#include "wx/containr.h" // wxControlContainer
class WXDLLEXPORT wxSplitterEvent;
class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
// ---------------------------------------------------------------------------
// splitter constants
@@ -367,7 +367,7 @@ public:
}
private:
friend class WXDLLEXPORT wxSplitterWindow;
friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;
// data for the different types of event
union

View File

@@ -15,8 +15,8 @@
#include "wx/bitmap.h"
class WXDLLEXPORT wxSearchButton;
class WXDLLEXPORT wxSearchTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxSearchButton;
class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;
// ----------------------------------------------------------------------------
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton

View File

@@ -20,7 +20,7 @@
#include "wx/panel.h"
#include "wx/list.h"
class WXDLLEXPORT wxTabView;
class WXDLLIMPEXP_FWD_CORE wxTabView;
/*
* A wxTabControl is the internal and visual representation

View File

@@ -22,7 +22,7 @@
#include "wx/valtext.h"
#endif
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];

View File

@@ -21,14 +21,14 @@
// forward declaration
// -----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericTreeItem;
class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;
class WXDLLEXPORT wxTreeItemData;
class WXDLLIMPEXP_FWD_CORE wxTreeItemData;
class WXDLLEXPORT wxTreeRenameTimer;
class WXDLLEXPORT wxTreeFindTimer;
class WXDLLEXPORT wxTreeTextCtrl;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeRenameTimer;
class WXDLLIMPEXP_FWD_CORE wxTreeFindTimer;
class WXDLLIMPEXP_FWD_CORE wxTreeTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// -----------------------------------------------------------------------------
// wxGenericTreeCtrl - the tree control

View File

@@ -16,11 +16,11 @@
// wxWizard
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticBitmap;
class WXDLLIMPEXP_ADV wxWizardEvent;
class WXDLLEXPORT wxBoxSizer;
class WXDLLIMPEXP_ADV wxWizardSizer;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
class WXDLLIMPEXP_FWD_ADV wxWizardEvent;
class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
class WXDLLIMPEXP_FWD_ADV wxWizardSizer;
class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase
{