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:
@@ -21,11 +21,11 @@
|
||||
typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
|
||||
#endif
|
||||
|
||||
class WXDLLEXPORT wxFrame;
|
||||
class WXDLLEXPORT wxWindowMac;
|
||||
class WXDLLEXPORT wxApp ;
|
||||
class WXDLLEXPORT wxKeyEvent;
|
||||
class WXDLLEXPORT wxLog;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindowMac;
|
||||
class WXDLLIMPEXP_FWD_CORE wxApp ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxLog;
|
||||
|
||||
// Force an exit from main loop
|
||||
void WXDLLEXPORT wxExit();
|
||||
|
@@ -15,15 +15,15 @@
|
||||
#include "wx/palette.h"
|
||||
|
||||
// Bitmap
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
class wxBitmapRefData ;
|
||||
class WXDLLEXPORT wxBitmapHandler;
|
||||
class WXDLLEXPORT wxControl;
|
||||
class WXDLLEXPORT wxCursor;
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxIcon;
|
||||
class WXDLLEXPORT wxImage;
|
||||
class WXDLLEXPORT wxPixelDataBase;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCursor;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxIcon;
|
||||
class WXDLLIMPEXP_FWD_CORE wxImage;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
|
||||
|
||||
// A mask is a bitmap used for drawing bitmaps
|
||||
// Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn
|
||||
@@ -89,7 +89,7 @@ class WXDLLEXPORT wxBitmap: public wxBitmapBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxBitmap)
|
||||
|
||||
friend class WXDLLEXPORT wxBitmapHandler;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
|
||||
|
||||
public:
|
||||
wxBitmap(); // Platform-specific
|
||||
|
@@ -16,7 +16,7 @@
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxBrush;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBrush;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ protected:
|
||||
DECLARE_DYNAMIC_CLASS(wxCheckBox)
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
|
||||
{
|
||||
public:
|
||||
|
@@ -25,7 +25,7 @@
|
||||
// wxClipboard
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDataObject;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataObject;
|
||||
class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||
|
@@ -23,7 +23,7 @@
|
||||
// classes
|
||||
// ---------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_ADV wxDataViewCtrl;
|
||||
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
|
||||
|
||||
// ---------------------------------------------------------
|
||||
// wxDataViewRenderer
|
||||
|
@@ -18,8 +18,8 @@
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxPaintDC;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPaintDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
class WXDLLEXPORT wxWindowDC: public wxDC
|
||||
{
|
||||
|
@@ -16,7 +16,7 @@
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
|
||||
|
||||
class WXDLLEXPORT wxMacToolTip ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
|
||||
|
||||
// Dialog boxes
|
||||
class WXDLLEXPORT wxDialog : public wxDialogBase
|
||||
|
@@ -23,13 +23,13 @@
|
||||
// classes
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
class WXDLLEXPORT wxDropTarget;
|
||||
class WXDLLEXPORT wxTextDropTarget;
|
||||
class WXDLLEXPORT wxFileDropTarget;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDropTarget;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;
|
||||
|
||||
class WXDLLEXPORT wxDropSource;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDropSource;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
|
@@ -59,13 +59,13 @@ extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
|
||||
|
||||
class wxFontColourSwatchCtrl;
|
||||
class wxFontPreviewCtrl;
|
||||
class WXDLLEXPORT wxSpinCtrl;
|
||||
class WXDLLEXPORT wxSpinEvent;
|
||||
class WXDLLEXPORT wxListBox;
|
||||
class WXDLLEXPORT wxChoice;
|
||||
class WXDLLEXPORT wxButton;
|
||||
class WXDLLEXPORT wxStaticText;
|
||||
class WXDLLEXPORT wxCheckBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxListBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxChoice;
|
||||
class WXDLLIMPEXP_FWD_CORE wxButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxStaticText;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
|
||||
|
||||
/*!
|
||||
* Control identifiers
|
||||
|
@@ -19,9 +19,9 @@
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
|
||||
|
||||
class WXDLLEXPORT wxMenuBar;
|
||||
class WXDLLEXPORT wxStatusBar;
|
||||
class WXDLLEXPORT wxMacToolTip ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
|
||||
|
||||
class WXDLLEXPORT wxFrame: public wxFrameBase
|
||||
{
|
||||
|
@@ -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 wxImageList: public wxObject
|
||||
{
|
||||
|
@@ -18,8 +18,8 @@
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
|
||||
|
||||
class WXDLLEXPORT wxMDIClientWindow;
|
||||
class WXDLLEXPORT wxMDIChildFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
|
||||
class WXDLLEXPORT wxMDIParentFrame: public wxFrame
|
||||
{
|
||||
@@ -106,7 +106,7 @@ protected:
|
||||
bool m_shouldBeShown;
|
||||
|
||||
private:
|
||||
friend class WXDLLEXPORT wxMDIChildFrame;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
#ifndef _WX_MENU_H_
|
||||
#define _WX_MENU_H_
|
||||
|
||||
class WXDLLEXPORT wxFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
|
@@ -30,7 +30,7 @@
|
||||
#define wxMetaFile wxMetafile
|
||||
#define wxMetaFileDC wxMetafileDC
|
||||
|
||||
class WXDLLEXPORT wxMetafile;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMetafile;
|
||||
class wxMetafileRefData ;
|
||||
|
||||
#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
|
||||
|
@@ -21,8 +21,8 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// fwd declarations
|
||||
class WXDLLEXPORT wxImageList;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxImageList;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxNotebook
|
||||
|
@@ -15,13 +15,13 @@
|
||||
#include "wx/colour.h"
|
||||
#include "wx/gdiobj.h"
|
||||
|
||||
class WXDLLEXPORT wxPalette;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPalette;
|
||||
|
||||
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
|
||||
{
|
||||
DECLARE_NO_COPY_CLASS(wxPaletteRefData)
|
||||
|
||||
friend class WXDLLEXPORT wxPalette;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxPalette;
|
||||
public:
|
||||
wxPaletteRefData();
|
||||
virtual ~wxPaletteRefData();
|
||||
|
@@ -16,11 +16,11 @@
|
||||
#include "wx/colour.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxPen;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPen;
|
||||
|
||||
class WXDLLEXPORT wxPenRefData: public wxGDIRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxPen;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxPen;
|
||||
public:
|
||||
wxPenRefData();
|
||||
wxPenRefData(const wxPenRefData& data);
|
||||
|
@@ -24,7 +24,7 @@
|
||||
* The Mac dialog for printing
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
class WXDLLEXPORT wxMacPrintDialog: public wxPrintDialogBase
|
||||
{
|
||||
public:
|
||||
@@ -74,7 +74,7 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
|
||||
|
||||
/*
|
||||
* wxMacPageMarginsDialog
|
||||
|
@@ -1175,8 +1175,8 @@ void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
|
||||
|
||||
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxIcon;
|
||||
friend class WXDLLEXPORT wxCursor;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxIcon;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxCursor;
|
||||
public:
|
||||
wxBitmapRefData(int width , int height , int depth);
|
||||
wxBitmapRefData();
|
||||
|
@@ -13,9 +13,9 @@
|
||||
#define _WX_RADIOBOX_H_
|
||||
|
||||
// List box item
|
||||
class WXDLLEXPORT wxBitmap ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap ;
|
||||
|
||||
class WXDLLEXPORT wxRadioButton ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRadioButton ;
|
||||
|
||||
class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
|
||||
{
|
||||
|
@@ -54,7 +54,7 @@ public:
|
||||
|
||||
// Not implemented
|
||||
#if 0
|
||||
class WXDLLEXPORT wxBitmap ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap ;
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
|
||||
|
||||
|
@@ -53,7 +53,7 @@ protected:
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion)
|
||||
friend class WXDLLEXPORT wxRegionIterator;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxRegionIterator : public wxObject
|
||||
|
@@ -24,10 +24,10 @@
|
||||
|
||||
#include "wx/containr.h"
|
||||
|
||||
class WXDLLEXPORT wxSpinButton;
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
class WXDLLEXPORT wxSpinCtrlText;
|
||||
class WXDLLEXPORT wxSpinCtrlButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinCtrlText;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
|
||||
|
@@ -12,8 +12,8 @@
|
||||
#ifndef _TASKBAR_H_
|
||||
#define _TASKBAR_H_
|
||||
|
||||
class WXDLLEXPORT wxIcon;
|
||||
class WXDLLEXPORT wxMenu;
|
||||
class WXDLLIMPEXP_FWD_CORE wxIcon;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMenu;
|
||||
|
||||
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
|
||||
{
|
||||
|
@@ -15,9 +15,9 @@
|
||||
#include "wx/brush.h"
|
||||
#include "wx/dc.h"
|
||||
|
||||
class WXDLLEXPORT wxButton;
|
||||
class WXDLLEXPORT wxScrollBar;
|
||||
class WXDLLEXPORT wxTopLevelWindowMac;
|
||||
class WXDLLIMPEXP_FWD_CORE wxButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollBar;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;
|
||||
|
||||
class wxMacControl ;
|
||||
|
||||
|
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "wx/fontenc.h"
|
||||
|
||||
class WXDLLIMPEXP_BASE wxString;
|
||||
class WXDLLIMPEXP_FWD_BASE wxString;
|
||||
|
||||
void wxMacConvertNewlines13To10( wxString *data ) ;
|
||||
void wxMacConvertNewlines10To13( wxString *data ) ;
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/event.h"
|
||||
|
||||
class WXDLLEXPORT wxJoystickThread;
|
||||
class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
|
||||
|
||||
class WXDLLEXPORT wxJoystick: public wxObject
|
||||
{
|
||||
|
Reference in New Issue
Block a user