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

@@ -12,7 +12,7 @@
#ifndef _WX_ACCEL_H_
#define _WX_ACCEL_H_
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
// ----------------------------------------------------------------------------
// the accel table has all accelerators for a given window or menu

View File

@@ -15,11 +15,11 @@
#include "wx/event.h"
#include "wx/icon.h"
class WXDLLIMPEXP_CORE wxFrame;
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_CORE wxApp;
class WXDLLIMPEXP_CORE wxKeyEvent;
class WXDLLIMPEXP_BASE wxLog;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxApp;
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
class WXDLLIMPEXP_FWD_BASE wxLog;
// Represents the application. Derive OnInit and declare
// a new App object to start application

View File

@@ -15,20 +15,20 @@
#include "wx/msw/gdiimage.h"
#include "wx/palette.h"
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxBitmapHandler;
class WXDLLEXPORT wxBitmapRefData;
class WXDLLEXPORT wxControl;
class WXDLLEXPORT wxCursor;
class WXDLLEXPORT wxDC;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
class WXDLLIMPEXP_FWD_CORE wxBitmapRefData;
class WXDLLIMPEXP_FWD_CORE wxControl;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxDC;
#if wxUSE_WXDIB
class WXDLLEXPORT wxDIB;
class WXDLLIMPEXP_FWD_CORE wxDIB;
#endif
class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
class WXDLLEXPORT wxPixelDataBase;
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxPalette;
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// ----------------------------------------------------------------------------
// wxBitmap: a mono or colour bitmap

View File

@@ -16,7 +16,7 @@
#include "wx/gdiobj.h"
#include "wx/bitmap.h"
class WXDLLEXPORT wxBrush;
class WXDLLIMPEXP_FWD_CORE wxBrush;
// ----------------------------------------------------------------------------
// wxBrush

View File

@@ -16,8 +16,8 @@
#error "wxCheckListBox class requires owner-drawn functionality."
#endif
class WXDLLEXPORT wxOwnerDrawn;
class WXDLLEXPORT wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
{

View File

@@ -47,7 +47,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
// wxClipboard
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDataObject;
class WXDLLIMPEXP_FWD_CORE wxDataObject;
class WXDLLEXPORT wxClipboard : public wxClipboardBase
{
DECLARE_DYNAMIC_CLASS(wxClipboard)

View File

@@ -14,7 +14,7 @@
#include "wx/msw/gdiimage.h"
class WXDLLEXPORT wxImage;
class WXDLLIMPEXP_FWD_CORE wxImage;
// Cursor
class WXDLLEXPORT wxCursor : public wxGDIImage

View File

@@ -24,7 +24,7 @@
// ----------------------------------------------------------------------------
// this one if used by wxPaintDC only
struct WXDLLEXPORT wxPaintDCInfo;
struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

View File

@@ -38,8 +38,8 @@
*
*/
class WXDLLIMPEXP_BASE wxDDEServer;
class WXDLLIMPEXP_BASE wxDDEClient;
class WXDLLIMPEXP_FWD_BASE wxDDEServer;
class WXDLLIMPEXP_FWD_BASE wxDDEClient;
class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase
{

View File

@@ -16,10 +16,10 @@
extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxDialogModalData;
class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
class WXDLLEXPORT wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
#endif

View File

@@ -12,8 +12,8 @@
#ifndef _WX_MSW_DIB_H_
#define _WX_MSW_DIB_H_
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxPalette;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxPalette;
#include "wx/msw/private.h"

View File

@@ -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);

View File

@@ -19,7 +19,7 @@
// ----------------------------------------------------------------------------
#if wxUSE_OWNER_DRAWN
class WXDLLEXPORT wxOwnerDrawn;
class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
// define the array of list box items
#include "wx/dynarray.h"
@@ -28,7 +28,7 @@
#endif // wxUSE_OWNER_DRAWN
// forward decl for GetSelections()
class WXDLLIMPEXP_BASE wxArrayInt;
class WXDLLIMPEXP_FWD_BASE wxArrayInt;
// ----------------------------------------------------------------------------
// List box control

View File

@@ -14,7 +14,7 @@
#include "wx/textctrl.h"
class WXDLLEXPORT wxImageList;
class WXDLLIMPEXP_FWD_CORE wxImageList;
/*
The wxListCtrl can show lists of items in four different modes:

View File

@@ -16,8 +16,8 @@
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame;
class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
// ---------------------------------------------------------------------------
// wxMDIParentFrame
@@ -114,7 +114,7 @@ protected:
bool m_parentFrameActive;
private:
friend class WXDLLEXPORT wxMDIChildFrame;
friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

View File

@@ -19,10 +19,10 @@
WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
#endif // wxUSE_ACCEL
class WXDLLEXPORT wxFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
#if defined(__WXWINCE__) && wxUSE_TOOLBAR
class WXDLLEXPORT wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
#endif

View File

@@ -23,11 +23,11 @@
// Metafile and metafile device context classes
// ----------------------------------------------------------------------------
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();
virtual ~wxMetafileRefData();

View File

@@ -19,7 +19,7 @@
// ----------------------------------------------------------------------------
class wxIAccessible;
class WXDLLEXPORT wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
// ----------------------------------------------------------------------------
// macros

View File

@@ -19,8 +19,8 @@
// ----------------------------------------------------------------------------
class wxIDropSource;
class WXDLLEXPORT wxDataObject;
class WXDLLEXPORT wxWindow;
class WXDLLIMPEXP_FWD_CORE wxDataObject;
class WXDLLIMPEXP_FWD_CORE wxWindow;
// ----------------------------------------------------------------------------
// macros

View File

@@ -230,7 +230,7 @@ private:
#if wxUSE_VARIANT
// Convert variants
class WXDLLIMPEXP_BASE wxVariant;
class WXDLLIMPEXP_FWD_BASE wxVariant;
WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);

View File

@@ -14,11 +14,11 @@
#include "wx/gdiobj.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(void);
virtual ~wxPaletteRefData(void);

View File

@@ -19,7 +19,7 @@
#include "wx/prntbase.h"
#include "wx/printdlg.h"
class WXDLLEXPORT wxDC;
class WXDLLIMPEXP_FWD_CORE wxDC;
//----------------------------------------------------------------------------
// wxWindowsPrintNativeData

View File

@@ -23,9 +23,9 @@
#include "wx/log.h"
class WXDLLEXPORT wxFont;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxFont;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
// ---------------------------------------------------------------------------
// private constants

View File

@@ -14,7 +14,7 @@
#include "wx/statbox.h"
class WXDLLEXPORT wxSubwindows;
class WXDLLIMPEXP_FWD_CORE wxSubwindows;
// ----------------------------------------------------------------------------
// wxRadioBox

View File

@@ -52,7 +52,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)
};

View File

@@ -12,7 +12,7 @@
#ifndef _WX_MSW_REGISTRY_H_
#define _WX_MSW_REGISTRY_H_
class WXDLLIMPEXP_BASE wxOutputStream;
class WXDLLIMPEXP_FWD_BASE wxOutputStream;
// ----------------------------------------------------------------------------
// class wxRegKey encapsulates window HKEY handle

View File

@@ -12,7 +12,7 @@
#ifndef _WX_SLIDER95_H_
#define _WX_SLIDER95_H_
class WXDLLEXPORT wxSubwindows;
class WXDLLIMPEXP_FWD_CORE wxSubwindows;
// Slider
class WXDLLEXPORT wxSlider : public wxSliderBase

View File

@@ -18,7 +18,7 @@
#include "wx/dynarray.h"
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
// ----------------------------------------------------------------------------

View File

@@ -12,7 +12,7 @@
#ifndef _WX_TABCTRL_H_
#define _WX_TABCTRL_H_
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxImageList;
// extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];

View File

@@ -16,7 +16,7 @@
#include "wx/icon.h"
// private helper class:
class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{

View File

@@ -14,7 +14,7 @@
#include "wx/object.h"
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLEXPORT wxToolTip : public wxObject
{

View File

@@ -32,7 +32,7 @@
// fwd decl
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxDragImage;
struct WXDLLEXPORT wxTreeViewItem;
struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
#if WXWIN_COMPATIBILITY_2_6
// NB: all the following flags are for compatbility only and will be removed in the

View File

@@ -22,7 +22,7 @@
#include "wx/dynarray.h"
class WXDLLEXPORT wxChoice;
class WXDLLIMPEXP_FWD_CORE wxChoice;
WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins);
// ----------------------------------------------------------------------------

View File

@@ -14,7 +14,7 @@
#include "wx/dynarray.h"
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
WX_DEFINE_EXPORTED_ARRAY_PTR(wxTextCtrl *, wxArrayTextSpins);
class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase