use WXDLLIMPEXP_FWD_CORE instead of WXDLLEXPORT to avoid newer mingw32 warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-12 02:31:04 +00:00
parent 2434c0104c
commit ffdf14fca4
91 changed files with 180 additions and 180 deletions

View File

@@ -137,7 +137,7 @@ private:
wxMenuItem *m_item;
// for compatibility with old code, use accessors now!
friend class WXDLLEXPORT wxMenu;
friend class WXDLLIMPEXP_FWD_CORE wxMenu;
};
// ----------------------------------------------------------------------------

View File

@@ -21,7 +21,7 @@
#include "wx/timer.h"
#include "wx/bitmap.h"
class WXDLLIMPEXP_ADV wxAnimation;
class WXDLLIMPEXP_FWD_ADV wxAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];

View File

@@ -16,8 +16,8 @@
#include "wx/bitmap.h"
#include "wx/icon.h"
class WXDLLEXPORT wxArtProvidersList;
class WXDLLEXPORT wxArtProviderCache;
class WXDLLIMPEXP_FWD_CORE wxArtProvidersList;
class WXDLLIMPEXP_FWD_CORE wxArtProviderCache;
class wxArtProviderModule;
// ----------------------------------------------------------------------------

View File

@@ -421,7 +421,7 @@ public:
class WXDLLIMPEXP_AUI wxAuiFloatingFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;
class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
{

View File

@@ -28,9 +28,9 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame;
//-----------------------------------------------------------------------------
// wxAuiMDIParentFrame

View File

@@ -159,7 +159,7 @@ private:
// wxCalendarCtrl events
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxCalendarCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent
{

View File

@@ -20,7 +20,7 @@
#include "wx/pickerbase.h"
class WXDLLIMPEXP_CORE wxColourPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];

View File

@@ -23,7 +23,7 @@
#endif
class WXDLLEXPORT wxPrintNativeDataBase;
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
class WXDLLEXPORT wxColourData: public wxObject

View File

@@ -16,7 +16,7 @@
#include "wx/gdiobj.h"
class WXDLLEXPORT wxColour;
class WXDLLIMPEXP_FWD_CORE wxColour;
// the standard wxColour constructors;
// this macro avoids to repeat these lines across all colour.h files, since

View File

@@ -39,11 +39,11 @@
// wxDataViewCtrl globals
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewModel;
class WXDLLIMPEXP_ADV wxDataViewListModel;
class WXDLLIMPEXP_ADV wxDataViewCtrl;
class WXDLLIMPEXP_ADV wxDataViewColumn;
class WXDLLIMPEXP_ADV wxDataViewRenderer;
class WXDLLIMPEXP_FWD_ADV wxDataViewModel;
class WXDLLIMPEXP_FWD_ADV wxDataViewListModel;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];

View File

@@ -27,9 +27,9 @@
#include "wx/longlong.h"
class WXDLLIMPEXP_BASE wxDateTime;
class WXDLLIMPEXP_BASE wxTimeSpan;
class WXDLLIMPEXP_BASE wxDateSpan;
class WXDLLIMPEXP_FWD_BASE wxDateTime;
class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
class WXDLLIMPEXP_FWD_BASE wxDateSpan;
#include "wx/dynarray.h"
@@ -125,7 +125,7 @@ WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
// argument for arguments of type wxDateTime; it is also returned by all
// functions returning wxDateTime on failure (this is why it is also called
// wxInvalidDateTime)
class WXDLLIMPEXP_BASE wxDateTime;
class WXDLLIMPEXP_FWD_BASE wxDateTime;
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultDateTimeFormat;
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultTimeSpanFormat;
@@ -1507,7 +1507,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE)
// virtual methods to work with the holidays they correspond to.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority;
class WXDLLIMPEXP_FWD_BASE wxDateTimeHolidayAuthority;
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDateTimeHolidayAuthority *,
wxHolidayAuthoritiesArray,
class WXDLLIMPEXP_BASE);

View File

@@ -30,8 +30,8 @@
#include "wx/dynarray.h"
#include "wx/math.h"
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxDCBase;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxDCBase;
class WXDLLEXPORT wxDrawObject
{

View File

@@ -14,9 +14,9 @@
#include "wx/list.h"
class WXDLLIMPEXP_BASE wxDDEClient;
class WXDLLIMPEXP_BASE wxDDEServer;
class WXDLLIMPEXP_BASE wxDDEConnection;
class WXDLLIMPEXP_FWD_BASE wxDDEClient;
class WXDLLIMPEXP_FWD_BASE wxDDEServer;
class WXDLLIMPEXP_FWD_BASE wxDDEConnection;
WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE);
WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE);

View File

@@ -78,7 +78,7 @@ public:
// wxDir: portable equivalent of {open/read/close}dir functions
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxDirData;
class WXDLLIMPEXP_FWD_BASE wxDirData;
class WXDLLIMPEXP_BASE wxDir
{

View File

@@ -246,7 +246,7 @@ private:
class WXDLLEXPORT wxDocTemplate: public wxObject
{
friend class WXDLLEXPORT wxDocManager;
friend class WXDLLIMPEXP_FWD_CORE wxDocManager;
public:
// Associate document and view types. They're for identifying what view is

View File

@@ -32,7 +32,7 @@
#define wxHAVE_DYNLIB_ERROR
#endif
class WXDLLIMPEXP_BASE wxDynamicLibraryDetailsCreator;
class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
// ----------------------------------------------------------------------------
// conditional compilation

View File

@@ -25,7 +25,7 @@
#include "wx/hashmap.h"
#include "wx/module.h"
class WXDLLIMPEXP_BASE wxPluginLibrary;
class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,

View File

@@ -39,7 +39,7 @@ class WXDLLIMPEXP_FWD_BASE wxList;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
#endif // wxUSE_GUI
class WXDLLIMPEXP_BASE wxEvtHandler;
class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
// ----------------------------------------------------------------------------
// Event types
@@ -414,7 +414,7 @@ protected:
private:
// it needs to access our m_propagationLevel
friend class WXDLLIMPEXP_BASE wxPropagateOnce;
friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce;
DECLARE_ABSTRACT_CLASS(wxEvent)
};

View File

@@ -14,7 +14,7 @@
#include "wx/utils.h"
class WXDLLEXPORT wxEventLoop;
class WXDLLIMPEXP_FWD_CORE wxEventLoop;
// ----------------------------------------------------------------------------
// wxEventLoop: a GUI event loop

View File

@@ -18,10 +18,10 @@
#include "wx/dialog.h"
class WXDLLEXPORT wxFindDialogEvent;
class WXDLLEXPORT wxFindReplaceDialog;
class WXDLLEXPORT wxFindReplaceData;
class WXDLLEXPORT wxFindReplaceDialogImpl;
class WXDLLIMPEXP_FWD_CORE wxFindDialogEvent;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialog;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceData;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl;
// ----------------------------------------------------------------------------
// Flags for wxFindReplaceData.Flags

View File

@@ -27,9 +27,9 @@
#include "wx/filename.h"
#include "wx/hashmap.h"
class WXDLLIMPEXP_BASE wxFSFile;
class WXDLLIMPEXP_BASE wxFileSystemHandler;
class WXDLLIMPEXP_BASE wxFileSystem;
class WXDLLIMPEXP_FWD_BASE wxFSFile;
class WXDLLIMPEXP_FWD_BASE wxFileSystemHandler;
class WXDLLIMPEXP_FWD_BASE wxFileSystem;
//--------------------------------------------------------------------------------
// wxFSFile

View File

@@ -105,7 +105,7 @@ enum
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxNativeFontInfo;
class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
class WXDLLEXPORT wxFontBase : public wxGDIObject
{

View File

@@ -20,7 +20,7 @@
#include "wx/pickerbase.h"
class WXDLLIMPEXP_CORE wxFontPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];

View File

@@ -79,7 +79,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
// wxGBSizerItem
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGridBagSizer;
class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
class WXDLLEXPORT wxGBSizerItem : public wxSizerItem

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

@@ -76,7 +76,7 @@ public:
// wxDirCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDirFilterListCtrl;
class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
class WXDLLEXPORT wxGenericDirCtrl: public wxControl
{

View File

@@ -2006,7 +2006,7 @@ private:
// Calculate the minimum acceptable size for labels area
wxCoord CalcColOrRowLabelAreaMinSize(bool column /* or row? */);
friend class WXDLLIMPEXP_ADV wxGridSelection;
friend class WXDLLIMPEXP_FWD_ADV wxGridSelection;
DECLARE_DYNAMIC_CLASS( wxGrid )
DECLARE_EVENT_TABLE()

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

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,8 +20,8 @@
#include "wx/gdicmn.h"
#include "wx/math.h"
class WXDLLIMPEXP_BASE wxDataInputStream;
class WXDLLIMPEXP_BASE wxDataOutputStream;
class WXDLLIMPEXP_FWD_BASE wxDataInputStream;
class WXDLLIMPEXP_FWD_BASE wxDataOutputStream;
// clipping from Cohen-Sutherland

View File

@@ -312,7 +312,7 @@ private:
class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node
{
friend class WXDLLIMPEXP_BASE wxHashTable;
friend class WXDLLIMPEXP_FWD_BASE wxHashTable;
public:
wxHashTable_Node( long key, void* value,
wxHashTableBase* table )

View File

@@ -22,7 +22,7 @@
#include "wx/dynarray.h"
#include "wx/font.h"
class WXDLLIMPEXP_HTML wxHtmlHelpData;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpData;
//--------------------------------------------------------------------------------
// helper classes & structs

View File

@@ -20,10 +20,10 @@
#include "wx/window.h"
class WXDLLIMPEXP_HTML wxHtmlWindowInterface;
class WXDLLIMPEXP_HTML wxHtmlLinkInfo;
class WXDLLIMPEXP_HTML wxHtmlCell;
class WXDLLIMPEXP_HTML wxHtmlContainerCell;
class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
class WXDLLIMPEXP_FWD_HTML wxHtmlLinkInfo;
class WXDLLIMPEXP_FWD_HTML wxHtmlCell;
class WXDLLIMPEXP_FWD_HTML wxHtmlContainerCell;
// wxHtmlSelection is data holder with information about text selection.

View File

@@ -28,9 +28,9 @@ class wxHtmlProcessor;
class wxHtmlWinModule;
class wxHtmlHistoryArray;
class wxHtmlProcessorList;
class WXDLLIMPEXP_HTML wxHtmlWinAutoScrollTimer;
class WXDLLIMPEXP_HTML wxHtmlCellEvent;
class WXDLLIMPEXP_HTML wxHtmlLinkEvent;
class WXDLLIMPEXP_FWD_HTML wxHtmlWinAutoScrollTimer;
class WXDLLIMPEXP_FWD_HTML wxHtmlCellEvent;
class WXDLLIMPEXP_FWD_HTML wxHtmlLinkEvent;
// wxHtmlWindow flags:

View File

@@ -19,11 +19,11 @@
#include "wx/html/htmlcell.h"
#include "wx/encconv.h"
class WXDLLIMPEXP_HTML wxHtmlWindow;
class WXDLLIMPEXP_HTML wxHtmlWindowInterface;
class WXDLLIMPEXP_HTML wxHtmlWinParser;
class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
class WXDLLIMPEXP_HTML wxHtmlTagsModule;
class WXDLLIMPEXP_FWD_HTML wxHtmlWindow;
class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler;
class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
//--------------------------------------------------------------------------------

View File

@@ -57,8 +57,8 @@ enum wxLayoutDirection
// forward decls
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxLocale;
class WXDLLIMPEXP_BASE wxLanguageInfoArray;
class WXDLLIMPEXP_FWD_BASE wxLocale;
class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;
class wxMsgCatalog;
// ============================================================================

View File

@@ -38,8 +38,8 @@ enum wxIPCFormat
wxIPC_PRIVATE = 20
};
class WXDLLIMPEXP_BASE wxServerBase;
class WXDLLIMPEXP_BASE wxClientBase;
class WXDLLIMPEXP_FWD_BASE wxServerBase;
class WXDLLIMPEXP_FWD_BASE wxClientBase;
class WXDLLIMPEXP_BASE wxConnectionBase: public wxObject
{

View File

@@ -54,7 +54,7 @@ extern "C"
typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);
}
class WXDLLIMPEXP_BASE wxObjectListNode;
class WXDLLIMPEXP_FWD_BASE wxObjectListNode;
typedef wxObjectListNode wxNode;
//
@@ -437,7 +437,7 @@ private:
extern WXDLLIMPEXP_DATA_BASE(wxListKey) wxDefaultListKey;
class WXDLLIMPEXP_BASE wxListBase;
class WXDLLIMPEXP_FWD_BASE wxListBase;
class WXDLLIMPEXP_BASE wxNodeBase
{
@@ -499,7 +499,7 @@ private:
// a double-linked list class
// -----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxList;
class WXDLLIMPEXP_FWD_BASE wxList;
class WXDLLIMPEXP_BASE wxListBase : public wxObject
{

View File

@@ -86,8 +86,8 @@
#ifndef wxUSE_LONGLONG_WX
#define wxUSE_LONGLONG_WX 0
class WXDLLIMPEXP_BASE wxLongLongNative;
class WXDLLIMPEXP_BASE wxULongLongNative;
class WXDLLIMPEXP_FWD_BASE wxLongLongNative;
class WXDLLIMPEXP_FWD_BASE wxULongLongNative;
typedef wxLongLongNative wxLongLong;
typedef wxULongLongNative wxULongLong;
#endif

View File

@@ -203,7 +203,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo,
class WXDLLIMPEXP_BASE wxFileType
{
friend class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl; // it has access to m_impl
friend class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl; // it has access to m_impl
public:
// An object of this class must be passed to Get{Open|Print}Command. The

View File

@@ -17,7 +17,7 @@
#include "wx/dynarray.h"
// declare a linked list of modules
class WXDLLIMPEXP_BASE wxModule;
class WXDLLIMPEXP_FWD_BASE wxModule;
WX_DECLARE_USER_EXPORTED_LIST(wxModule, wxModuleList, WXDLLIMPEXP_BASE);
// and an array of class info objects

View File

@@ -18,7 +18,7 @@
#include "wx/stream.h"
class WXDLLIMPEXP_BASE wxMemoryOutputStream;
class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream;
class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
{

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

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

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

@@ -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 @@
#include <GL/gl.h>
class WXDLLIMPEXP_GL wxGLCanvas; /* forward reference */
class WXDLLIMPEXP_FWD_GL wxGLCanvas; /* forward reference */
class WXDLLIMPEXP_GL wxGLContext: public wxObject
{

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
@@ -111,7 +111,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

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

@@ -18,7 +18,7 @@
typedef WXDWORD wxMSWDash;
class WXDLLEXPORT wxPen;
class WXDLLIMPEXP_FWD_CORE wxPen;
// VZ: this class should be made private
class WXDLLEXPORT wxPenRefData : public wxGDIRefData
@@ -54,7 +54,7 @@ protected:
WXHPEN m_hPen;
private:
friend class WXDLLEXPORT wxPen;
friend class WXDLLIMPEXP_FWD_CORE wxPen;
// Cannot use
// DECLARE_NO_COPY_CLASS(wxPenRefData)

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_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

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

@@ -19,7 +19,7 @@
#include "wx/memory.h"
class WXDLLIMPEXP_BASE wxObject;
class WXDLLIMPEXP_FWD_BASE wxObject;
#ifndef wxUSE_EXTENDED_RTTI
#define wxUSE_EXTENDED_RTTI 0
@@ -33,9 +33,9 @@ class WXDLLIMPEXP_BASE wxObject;
// conditional compilation
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxClassInfo;
class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_BASE wxObjectRefData;
class WXDLLIMPEXP_FWD_BASE wxClassInfo;
class WXDLLIMPEXP_FWD_BASE wxHashTable;
class WXDLLIMPEXP_FWD_BASE wxObjectRefData;
// ----------------------------------------------------------------------------
// wxClassInfo
@@ -388,7 +388,7 @@ inline void* wxCheckCast(void *ptr)
class WXDLLIMPEXP_BASE wxObjectRefData
{
friend class WXDLLIMPEXP_BASE wxObject;
friend class WXDLLIMPEXP_FWD_BASE wxObject;
public:
wxObjectRefData() : m_count(1) { }

View File

@@ -45,7 +45,7 @@ public:
wxOverlayImpl *GetImpl() { return m_impl; }
private:
friend class WXDLLEXPORT wxDCOverlay;
friend class WXDLLIMPEXP_FWD_CORE wxDCOverlay;
// returns true if it has been setup
bool IsOk();

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

@@ -68,7 +68,7 @@ private:
WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
class WXDLLEXPORT wxPrintPaperTypeList;
class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList;
class WXDLLEXPORT wxPrintPaperDatabase
{

View File

@@ -77,8 +77,8 @@ public:
// when the user clicks mouse outside it or if it loses focus in any other way
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPopupWindowHandler;
class WXDLLEXPORT wxPopupFocusHandler;
class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler;
class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler;
class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
{

View File

@@ -28,7 +28,7 @@
#include "wx/bitmap.h"
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
// generic implementation of wxOverlay
class wxOverlayImpl

View File

@@ -68,7 +68,7 @@ enum
// wxRegEx: a regular expression
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxRegExImpl;
class WXDLLIMPEXP_FWD_BASE wxRegExImpl;
class WXDLLIMPEXP_BASE wxRegEx
{

View File

@@ -91,19 +91,19 @@ extern WXDLLIMPEXP_RICHTEXT const wxChar wxRichTextLineBreakChar;
* Forward declarations
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextObject;
class WXDLLIMPEXP_RICHTEXT wxRichTextCacheObject;
class WXDLLIMPEXP_RICHTEXT wxRichTextObjectList;
class WXDLLIMPEXP_RICHTEXT wxRichTextLine;
class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph;
class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler;
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet;
class WXDLLIMPEXP_RICHTEXT wxTextAttrEx;
class WXDLLIMPEXP_RICHTEXT wxRichTextListStyleDefinition;
class WXDLLIMPEXP_RICHTEXT wxRichTextEvent;
class WXDLLIMPEXP_RICHTEXT wxRichTextRenderer;
class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCtrl;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObject;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCacheObject;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObjectList;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextLine;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextParagraph;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFileHandler;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleSheet;
class WXDLLIMPEXP_FWD_RICHTEXT wxTextAttrEx;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextListStyleDefinition;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextEvent;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextRenderer;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
/*!
* Flags determining the available space, passed to Layout
@@ -1472,8 +1472,8 @@ protected:
* wxRichTextImageBlock stores information about an image, in binary in-memory form
*/
class WXDLLIMPEXP_BASE wxDataInputStream;
class WXDLLIMPEXP_BASE wxDataOutputStream;
class WXDLLIMPEXP_FWD_BASE wxDataInputStream;
class WXDLLIMPEXP_FWD_BASE wxDataOutputStream;
class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject
{
@@ -1620,8 +1620,8 @@ protected:
* This is a kind of box, used to represent the whole buffer
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextCommand;
class WXDLLIMPEXP_RICHTEXT wxRichTextAction;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCommand;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox
{
@@ -2010,7 +2010,7 @@ enum wxRichTextCommandId
*
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextAction;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
class WXDLLIMPEXP_RICHTEXT wxRichTextCommand: public wxCommand
{
public:

View File

@@ -25,7 +25,7 @@
* wxRichTextXMLHandler
*/
class WXDLLIMPEXP_XML wxXmlNode;
class WXDLLIMPEXP_FWD_XML wxXmlNode;
class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
{

View File

@@ -49,8 +49,8 @@
*
*/
class WXDLLIMPEXP_NET wxTCPServer;
class WXDLLIMPEXP_NET wxTCPClient;
class WXDLLIMPEXP_FWD_NET wxTCPServer;
class WXDLLIMPEXP_FWD_NET wxTCPClient;
class WXDLLIMPEXP_NET wxTCPConnection: public wxConnectionBase
{

View File

@@ -21,9 +21,9 @@
#include "wx/string.h"
#include "wx/filefn.h" // for wxFileOffset, wxInvalidOffset and wxSeekMode
class WXDLLIMPEXP_BASE wxStreamBase;
class WXDLLIMPEXP_BASE wxInputStream;
class WXDLLIMPEXP_BASE wxOutputStream;
class WXDLLIMPEXP_FWD_BASE wxStreamBase;
class WXDLLIMPEXP_FWD_BASE wxInputStream;
class WXDLLIMPEXP_FWD_BASE wxOutputStream;
typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);

View File

@@ -55,7 +55,7 @@
#include "wx/buffer.h" // for wxCharBuffer
#include "wx/strconv.h" // for wxConvertXXX() macros and wxMBConv classes
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_BASE wxString;
// ---------------------------------------------------------------------------
// macros
@@ -252,7 +252,7 @@ struct WXDLLIMPEXP_BASE wxStringData
class WXDLLIMPEXP_BASE wxStringBase
{
#if !wxUSE_STL
friend class WXDLLIMPEXP_BASE wxArrayString;
friend class WXDLLIMPEXP_FWD_BASE wxArrayString;
#endif
public :
// an 'invalid' value for string index, moved to this place due to a CW bug
@@ -659,7 +659,7 @@ public:
class WXDLLIMPEXP_BASE wxString : public wxStringBase
{
#if !wxUSE_STL
friend class WXDLLIMPEXP_BASE wxArrayString;
friend class WXDLLIMPEXP_FWD_BASE wxArrayString;
#endif
// NB: special care was taken in arranging the member functions in such order

View File

@@ -18,7 +18,7 @@
#include "wx/event.h"
class WXDLLIMPEXP_ADV wxTaskBarIconEvent;
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconEvent;
// ----------------------------------------------------------------------------
// wxTaskBarIconBase: define wxTaskBarIcon interface

View File

@@ -44,8 +44,8 @@
#define NO_TEXT_WINDOW_STREAM
#endif
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxTextCtrlBase;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrlBase;
// ----------------------------------------------------------------------------
// wxTextCtrl types

View File

@@ -109,11 +109,11 @@ enum wxMutexType
};
// forward declarations
class WXDLLIMPEXP_BASE wxThreadHelper;
class WXDLLIMPEXP_BASE wxConditionInternal;
class WXDLLIMPEXP_BASE wxMutexInternal;
class WXDLLIMPEXP_BASE wxSemaphoreInternal;
class WXDLLIMPEXP_BASE wxThreadInternal;
class WXDLLIMPEXP_FWD_BASE wxThreadHelper;
class WXDLLIMPEXP_FWD_BASE wxConditionInternal;
class WXDLLIMPEXP_FWD_BASE wxMutexInternal;
class WXDLLIMPEXP_FWD_BASE wxSemaphoreInternal;
class WXDLLIMPEXP_FWD_BASE wxThreadInternal;
// ----------------------------------------------------------------------------
// A mutex object is a synchronization object whose state is set to signaled

View File

@@ -26,7 +26,7 @@
#endif
#include "wx/arrstr.h"
class WXDLLEXPORT wxTipWindowView;
class WXDLLIMPEXP_FWD_CORE wxTipWindowView;
// ----------------------------------------------------------------------------
// wxTipWindow

View File

@@ -24,7 +24,7 @@
// the default names for various classes
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
class WXDLLEXPORT wxTopLevelWindowBase;
class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
// ----------------------------------------------------------------------------
// constants

View File

@@ -107,8 +107,8 @@ inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2)
class WXDLLEXPORT wxTreeItemData: public wxClientData
{
friend class WXDLLEXPORT wxTreeCtrl;
friend class WXDLLEXPORT wxGenericTreeCtrl;
friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;
public:
// creation/destruction
// --------------------
@@ -265,7 +265,7 @@ private:
// descriptions below
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTreeCtrlBase;
class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase;
class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
{
@@ -320,8 +320,8 @@ private:
wxString m_label;
bool m_editCancelled;
friend class WXDLLEXPORT wxTreeCtrl;
friend class WXDLLEXPORT wxGenericTreeCtrl;
friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;
DECLARE_DYNAMIC_CLASS(wxTreeEvent)
};

View File

@@ -17,8 +17,8 @@
#if wxUSE_STREAMS
class WXDLLIMPEXP_BASE wxTextInputStream;
class WXDLLIMPEXP_BASE wxTextOutputStream;
class WXDLLIMPEXP_FWD_BASE wxTextInputStream;
class WXDLLIMPEXP_FWD_BASE wxTextOutputStream;
typedef wxTextInputStream& (*__wxTextInputManip)(wxTextInputStream&);
typedef wxTextOutputStream& (*__wxTextOutputManip)(wxTextOutputStream&);

View File

@@ -46,10 +46,10 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
// Forward declaration
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxProcess;
class WXDLLIMPEXP_CORE wxFrame;
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_CORE wxWindowList;
class WXDLLIMPEXP_FWD_BASE wxProcess;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowList;
// ----------------------------------------------------------------------------
// Macros

View File

@@ -18,8 +18,8 @@
#include "wx/event.h"
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
/*
A validator has up to three purposes:

View File

@@ -15,7 +15,7 @@
#include "wx/vscroll.h" // base class
#include "wx/bitmap.h"
class WXDLLEXPORT wxSelectionStore;
class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
#define wxVListBoxNameStr _T("wxVListBox")

View File

@@ -34,7 +34,7 @@
#define wxWIZARD_EX_HELPBUTTON 0x00000010
// forward declarations
class WXDLLIMPEXP_ADV wxWizard;
class WXDLLIMPEXP_FWD_ADV wxWizard;
// ----------------------------------------------------------------------------
// wxWizardPage is one of the wizards screen: it must know what are the

View File

@@ -15,7 +15,7 @@
#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
class WXDLLIMPEXP_ADV wxBitmapComboBox;
class WXDLLIMPEXP_FWD_ADV wxBitmapComboBox;
class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
{

View File

@@ -13,7 +13,7 @@
#if wxUSE_XRC && wxUSE_CHOICEBOOK
class WXDLLEXPORT wxChoicebook;
class WXDLLIMPEXP_FWD_CORE wxChoicebook;
class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
{

View File

@@ -13,7 +13,7 @@
#if wxUSE_XRC && wxUSE_LISTBOOK
class WXDLLEXPORT wxListbook;
class WXDLLIMPEXP_FWD_CORE wxListbook;
class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
{

View File

@@ -14,7 +14,7 @@
#if wxUSE_XRC && wxUSE_NOTEBOOK
class WXDLLEXPORT wxNotebook;
class WXDLLIMPEXP_FWD_CORE wxNotebook;
class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
{

View File

@@ -16,7 +16,7 @@
#if wxUSE_XRC
#if wxABI_VERSION >= 20805
class WXDLLEXPORT wxPropertySheetDialog;
class WXDLLIMPEXP_FWD_ADV wxPropertySheetDialog;
class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxXmlResourceHandler
{

View File

@@ -15,7 +15,7 @@
#if wxUSE_XRC && wxUSE_TOOLBAR
class WXDLLEXPORT wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
{

View File

@@ -14,7 +14,7 @@
#if wxUSE_XRC && wxUSE_TREEBOOK
class WXDLLEXPORT wxTreebook;
class WXDLLIMPEXP_FWD_CORE wxTreebook;
#include "wx/dynarray.h"
WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,

View File

@@ -15,8 +15,8 @@
#if wxUSE_XRC && wxUSE_WIZARDDLG
class WXDLLEXPORT wxWizard;
class WXDLLEXPORT wxWizardPageSimple;
class WXDLLIMPEXP_FWD_ADV wxWizard;
class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;
class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
{

View File

@@ -112,8 +112,8 @@ enum wxZipFlags
// Forward decls
//
class WXDLLIMPEXP_BASE wxZipEntry;
class WXDLLIMPEXP_BASE wxZipInputStream;
class WXDLLIMPEXP_FWD_BASE wxZipEntry;
class WXDLLIMPEXP_FWD_BASE wxZipInputStream;
/////////////////////////////////////////////////////////////////////////////

View File

@@ -49,7 +49,7 @@
// array types
// -----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericTreeItem;
class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;
WX_DEFINE_EXPORTED_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);