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:
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
class WXDLLEXPORT wxAcceleratorTable;
|
||||
class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
|
||||
|
||||
// Hold Ctrl key down
|
||||
#define wxACCEL_ALT 0x01
|
||||
|
@@ -37,11 +37,11 @@
|
||||
#include "wx/event.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
class WXDLLEXPORT wxFrame;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLEXPORT wxApp;
|
||||
class WXDLLEXPORT wxKeyEvent;
|
||||
class WXDLLEXPORT wxLog;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxApp;
|
||||
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxLog;
|
||||
|
||||
WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
|
||||
WXDLLEXPORT_DATA(extern HAB) vHabmain;
|
||||
|
@@ -17,15 +17,15 @@
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/palette.h"
|
||||
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxControl;
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLEXPORT wxBitmapHandler;
|
||||
class WXDLLEXPORT wxIcon;
|
||||
class WXDLLEXPORT wxMask;
|
||||
class WXDLLEXPORT wxCursor;
|
||||
class WXDLLEXPORT wxControl;
|
||||
class WXDLLEXPORT wxImage;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDC;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxIcon;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMask;
|
||||
class WXDLLIMPEXP_FWD_CORE wxCursor;
|
||||
class WXDLLIMPEXP_FWD_CORE wxControl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxImage;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Bitmap data
|
||||
|
@@ -16,11 +16,11 @@
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxBrush;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBrush;
|
||||
|
||||
class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxBrush;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxBrush;
|
||||
public:
|
||||
wxBrushRefData();
|
||||
wxBrushRefData(const wxBrushRefData& rData);
|
||||
|
@@ -15,7 +15,7 @@
|
||||
#include "wx/control.h"
|
||||
|
||||
// Checkbox item (single checkbox)
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
|
||||
{
|
||||
public:
|
||||
|
@@ -50,7 +50,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
|
||||
// wxClipboard
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDataObject;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDataObject;
|
||||
class WXDLLEXPORT wxClipboard : public wxClipboardBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||
|
@@ -24,7 +24,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// this one if used by wxPaintDC only
|
||||
struct WXDLLEXPORT wxPaintDCInfo;
|
||||
struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
|
||||
|
||||
WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
|
||||
|
||||
|
@@ -16,7 +16,7 @@
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
|
||||
|
||||
class WXDLLEXPORT wxDialogModalData;
|
||||
class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
|
||||
|
||||
//
|
||||
// Dialog boxes
|
||||
|
@@ -20,9 +20,9 @@
|
||||
#include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID
|
||||
#include "wx/list.h"
|
||||
|
||||
class WXDLLEXPORT wxGDIImageRefData;
|
||||
class WXDLLEXPORT wxGDIImageHandler;
|
||||
class WXDLLEXPORT wxGDIImage;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGDIImage;
|
||||
|
||||
WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
class WXDLLEXPORT wxOwnerDrawn;
|
||||
class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
|
||||
|
||||
// define the array of list box items
|
||||
#include "wx/dynarray.h"
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include "wx/textctrl.h"
|
||||
|
||||
|
||||
class WXDLLEXPORT wxImageList;
|
||||
class WXDLLIMPEXP_FWD_CORE wxImageList;
|
||||
|
||||
typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData);
|
||||
|
||||
|
@@ -16,14 +16,14 @@
|
||||
|
||||
#include "wx/frame.h"
|
||||
|
||||
class WXDLLEXPORT wxMDIClientWindow;
|
||||
class WXDLLEXPORT wxMDIChildFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
|
||||
class WXDLLEXPORT wxMDIParentFrame: public wxFrame
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
|
||||
|
||||
friend class WXDLLEXPORT wxMDIChildFrame;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
|
||||
public:
|
||||
|
||||
wxMDIParentFrame();
|
||||
|
@@ -20,7 +20,7 @@
|
||||
WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
class WXDLLEXPORT wxFrame;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
||||
|
||||
void wxSetShortCutKey(wxChar* zText);
|
||||
|
||||
|
@@ -30,11 +30,11 @@
|
||||
#define wxMetaFile wxMetafile
|
||||
#define wxMetaFileDC wxMetafileDC
|
||||
|
||||
class WXDLLEXPORT wxMetafile;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMetafile;
|
||||
|
||||
class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxMetafile;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
|
||||
public:
|
||||
wxMetafileRefData(void);
|
||||
virtual ~wxMetafileRefData(void);
|
||||
|
@@ -15,11 +15,11 @@
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
class WXDLLEXPORT wxPalette;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPalette;
|
||||
|
||||
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
|
||||
{
|
||||
friend class WXDLLEXPORT wxPalette;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxPalette;
|
||||
public:
|
||||
wxPaletteRefData();
|
||||
virtual ~wxPaletteRefData();
|
||||
|
@@ -17,11 +17,11 @@
|
||||
|
||||
typedef long wxPMDash;
|
||||
|
||||
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& rData);
|
||||
|
@@ -78,10 +78,10 @@
|
||||
#include "wx/dlimpexp.h"
|
||||
#include "wx/fontenc.h"
|
||||
|
||||
class WXDLLEXPORT wxFont;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLIMPEXP_BASE wxString;
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLIMPEXP_FWD_CORE wxFont;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
class WXDLLIMPEXP_FWD_BASE wxString;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// private constants
|
||||
|
@@ -13,7 +13,7 @@
|
||||
#define _WX_RADIOBOX_H_
|
||||
|
||||
// List box item
|
||||
class WXDLLEXPORT wxBitmap ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxBitmap ;
|
||||
|
||||
class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
|
||||
{
|
||||
|
@@ -75,7 +75,7 @@ protected:
|
||||
virtual bool DoOffset(wxCoord x, wxCoord y);
|
||||
virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
|
||||
|
||||
friend class WXDLLEXPORT wxRegionIterator;
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion);
|
||||
|
||||
}; // end of CLASS wxRegion
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/spinbutt.h" // the base class
|
||||
#include "wx/dynarray.h"
|
||||
class WXDLLEXPORT wxSpinCtrl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
|
||||
WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -29,7 +29,7 @@ typedef long wxDataType;
|
||||
// fwd decl
|
||||
class WXDLLEXPORT wxImageList;
|
||||
class WXDLLEXPORT wxDragImage;
|
||||
struct WXDLLEXPORT wxTreeViewItem;
|
||||
struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
|
||||
|
||||
// a callback function used for sorting tree items, it should return -1 if the
|
||||
// first item precedes the second, +1 if the second precedes the first or 0 if
|
||||
|
@@ -34,7 +34,7 @@
|
||||
// forward declarations
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxButton;
|
||||
class WXDLLIMPEXP_FWD_CORE wxButton;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxWindow declaration for OS/2 PM
|
||||
|
Reference in New Issue
Block a user