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:
@@ -12,7 +12,7 @@
|
||||
#ifndef _WX_UNIV_BUTTON_H_
|
||||
#define _WX_UNIV_BUTTON_H_
|
||||
|
||||
class WXDLLEXPORT wxInputHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxInputHandler;
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
#ifndef _WX_UNIV_COLSCHEM_H_
|
||||
#define _WX_UNIV_COLSCHEM_H_
|
||||
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
#include "wx/colour.h"
|
||||
#include "wx/checkbox.h"
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
||||
#include "wx/combo.h"
|
||||
|
||||
class WXDLLEXPORT wxListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxListBox;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// NB: some actions supported by this control are in wx/generic/combo.h
|
||||
|
@@ -12,9 +12,9 @@
|
||||
#ifndef _WX_UNIV_CONTROL_H_
|
||||
#define _WX_UNIV_CONTROL_H_
|
||||
|
||||
class WXDLLEXPORT wxControlRenderer;
|
||||
class WXDLLEXPORT wxInputHandler;
|
||||
class WXDLLEXPORT wxRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxInputHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRenderer;
|
||||
|
||||
// we must include it as most/all control classes derive their handlers from
|
||||
// it
|
||||
|
@@ -12,8 +12,8 @@
|
||||
#define _WX_UNIV_DIALOG_H_
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
|
||||
class WXDLLEXPORT wxWindowDisabler;
|
||||
class WXDLLEXPORT wxEventLoop;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxEventLoop;
|
||||
|
||||
// Dialog boxes
|
||||
class WXDLLEXPORT wxDialog : public wxDialogBase
|
||||
|
@@ -12,8 +12,8 @@
|
||||
#ifndef _WX_UNIV_INPCONS_H_
|
||||
#define _WX_UNIV_INPCONS_H_
|
||||
|
||||
class WXDLLEXPORT wxInputHandler;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxInputHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/event.h"
|
||||
|
@@ -19,12 +19,12 @@
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
// fwd declarations
|
||||
class WXDLLEXPORT wxMenuInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenuInfo;
|
||||
WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
|
||||
|
||||
class WXDLLEXPORT wxMenuGeometryInfo;
|
||||
class WXDLLEXPORT wxPopupMenuWindow;
|
||||
class WXDLLEXPORT wxRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenuGeometryInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPopupMenuWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRenderer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
class WXDLLEXPORT wxSpinButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinButton;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// the actions supported by this control
|
||||
|
@@ -12,7 +12,7 @@
|
||||
#ifndef _WX_UNIV_RADIOBOX_H_
|
||||
#define _WX_UNIV_RADIOBOX_H_
|
||||
|
||||
class WXDLLEXPORT wxRadioButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRadioButton;
|
||||
|
||||
#include "wx/statbox.h"
|
||||
#include "wx/dynarray.h"
|
||||
|
@@ -30,27 +30,27 @@
|
||||
|
||||
#include "wx/renderer.h"
|
||||
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxCheckListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
|
||||
|
||||
#if wxUSE_LISTBOX
|
||||
class WXDLLEXPORT wxListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxListBox;
|
||||
#endif // wxUSE_LISTBOX
|
||||
|
||||
#if wxUSE_MENUS
|
||||
class WXDLLEXPORT wxMenu;
|
||||
class WXDLLEXPORT wxMenuGeometryInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenu;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenuGeometryInfo;
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
class WXDLLEXPORT wxScrollBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollBar;
|
||||
|
||||
#if wxUSE_TEXTCTRL
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
|
||||
#endif
|
||||
|
||||
#if wxUSE_GAUGE
|
||||
class WXDLLEXPORT wxGauge;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGauge;
|
||||
#endif // wxUSE_GAUGE
|
||||
|
||||
#include "wx/string.h"
|
||||
|
@@ -23,11 +23,11 @@
|
||||
// to derive from the wxControlWithArrows interface and implement its methods.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxControlWithArrows;
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxMouseEvent;
|
||||
class WXDLLEXPORT wxRect;
|
||||
class WXDLLEXPORT wxRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControlWithArrows;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRect;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRenderer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxScrollArrows: an abstraction of scrollbar arrow
|
||||
|
@@ -12,7 +12,7 @@
|
||||
#ifndef _WX_UNIV_SCROLBAR_H_
|
||||
#define _WX_UNIV_SCROLBAR_H_
|
||||
|
||||
class WXDLLEXPORT wxScrollTimer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
|
||||
|
||||
#include "wx/univ/scrarrow.h"
|
||||
#include "wx/renderer.h"
|
||||
|
@@ -20,10 +20,10 @@
|
||||
// This class is similar to wxScrollThumb.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxControlWithThumb;
|
||||
class WXDLLEXPORT wxMouseEvent;
|
||||
class WXDLLEXPORT wxRect;
|
||||
class WXDLLEXPORT wxScrollTimer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControlWithThumb;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRect;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
|
||||
|
||||
#include "wx/timer.h"
|
||||
|
||||
@@ -76,7 +76,7 @@ private:
|
||||
Shaft m_shaftPart;
|
||||
|
||||
// the data for the mouse capture
|
||||
struct WXDLLEXPORT wxScrollThumbCaptureData *m_captureData;
|
||||
struct WXDLLIMPEXP_FWD_CORE wxScrollThumbCaptureData *m_captureData;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -14,7 +14,7 @@
|
||||
#include "wx/univ/renderer.h"
|
||||
#include "wx/pen.h"
|
||||
|
||||
class WXDLLEXPORT wxColourScheme;
|
||||
class WXDLLIMPEXP_FWD_CORE wxColourScheme;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxStdRenderer: implements as much of wxRenderer API as possible generically
|
||||
|
@@ -12,8 +12,8 @@
|
||||
#ifndef _WX_UNIV_TEXTCTRL_H_
|
||||
#define _WX_UNIV_TEXTCTRL_H_
|
||||
|
||||
class WXDLLEXPORT wxCaret;
|
||||
class WXDLLEXPORT wxTextCtrlCommandProcessor;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCaret;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor;
|
||||
|
||||
#include "wx/scrolwin.h" // for wxScrollHelper
|
||||
|
||||
|
@@ -20,12 +20,12 @@
|
||||
// wxTheme
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxArtProvider;
|
||||
class WXDLLEXPORT wxColourScheme;
|
||||
class WXDLLEXPORT wxInputConsumer;
|
||||
class WXDLLEXPORT wxInputHandler;
|
||||
class WXDLLEXPORT wxRenderer;
|
||||
struct WXDLLEXPORT wxThemeInfo;
|
||||
class WXDLLIMPEXP_FWD_CORE wxArtProvider;
|
||||
class WXDLLIMPEXP_FWD_CORE wxColourScheme;
|
||||
class WXDLLIMPEXP_FWD_CORE wxInputConsumer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxInputHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRenderer;
|
||||
struct WXDLLIMPEXP_FWD_CORE wxThemeInfo;
|
||||
|
||||
class WXDLLEXPORT wxTheme
|
||||
{
|
||||
@@ -73,7 +73,7 @@ private:
|
||||
|
||||
// the current theme
|
||||
static wxTheme *ms_theme;
|
||||
friend struct WXDLLEXPORT wxThemeInfo;
|
||||
friend struct wxThemeInfo;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/button.h" // for wxStdButtonInputHandler
|
||||
|
||||
class WXDLLEXPORT wxToolBarTool;
|
||||
class WXDLLIMPEXP_FWD_CORE wxToolBarTool;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// the actions supported by this control
|
||||
|
@@ -16,18 +16,18 @@
|
||||
|
||||
#include "wx/bitmap.h" // for m_bitmapBg
|
||||
|
||||
class WXDLLEXPORT wxControlRenderer;
|
||||
class WXDLLEXPORT wxEventLoop;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxEventLoop;
|
||||
|
||||
#if wxUSE_MENUS
|
||||
class WXDLLEXPORT wxMenu;
|
||||
class WXDLLEXPORT wxMenuBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenu;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
class WXDLLEXPORT wxRenderer;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRenderer;
|
||||
|
||||
#if wxUSE_SCROLLBAR
|
||||
class WXDLLEXPORT wxScrollBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollBar;
|
||||
#endif // wxUSE_SCROLLBAR
|
||||
|
||||
#ifdef __WXX11__
|
||||
|
Reference in New Issue
Block a user