use WXDLLIMPEXP_FWD instead of WXDLLIMPEXP to avoid gcc4 warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-10 01:09:42 +00:00
parent 3f9ba9a06a
commit 40e0c0c3b5
45 changed files with 107 additions and 107 deletions

View File

@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_BASE wxLog;
class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
#if wxUSE_GUI
class WXDLLEXPORT wxEventLoop;
class WXDLLIMPEXP_FWD_BASE wxEventLoop;
struct WXDLLIMPEXP_FWD_CORE wxVideoMode;
#endif

View File

@@ -15,15 +15,15 @@
#include "wx/string.h"
#include "wx/platinfo.h"
class WXDLLIMPEXP_BASE wxObject;
class WXDLLEXPORT wxAppTraits;
class WXDLLIMPEXP_FWD_BASE wxObject;
class WXDLLIMPEXP_FWD_BASE wxAppTraits;
#if wxUSE_FONTMAP
class WXDLLEXPORT wxFontMapper;
class WXDLLIMPEXP_FWD_CORE wxFontMapper;
#endif // wxUSE_FONTMAP
class WXDLLIMPEXP_BASE wxLog;
class WXDLLIMPEXP_BASE wxMessageOutput;
class WXDLLEXPORT wxRendererNative;
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_BASE wxLog;
class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
class WXDLLIMPEXP_FWD_CORE wxRendererNative;
class WXDLLIMPEXP_FWD_BASE wxString;
class GSocketGUIFunctionsTable;
@@ -32,7 +32,7 @@ class GSocketGUIFunctionsTable;
// wxAppTraits: this class defines various configurable aspects of wxApp
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxStandardPathsBase;
class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase;
class WXDLLIMPEXP_BASE wxAppTraitsBase
{

View File

@@ -20,8 +20,8 @@
// forward declarations
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
// ----------------------------------------------------------------------------
// headers we have to include

View File

@@ -19,7 +19,7 @@
#include "wx/bookctrl.h"
#include "wx/choice.h"
class WXDLLEXPORT wxChoice;
class WXDLLIMPEXP_FWD_CORE wxChoice;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;

View File

@@ -16,7 +16,7 @@
#include "wx/object.h"
#include "wx/list.h"
class WXDLLEXPORT wxMenu;
class WXDLLIMPEXP_FWD_CORE wxMenu;
// ----------------------------------------------------------------------------
// wxCommand: a single command capable of performing itself

View File

@@ -46,8 +46,8 @@
#include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
#include "wx/bitmap.h" // wxBitmap used by-value
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLEXPORT wxComboPopup;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxComboPopup;
//
// New window styles for wxComboCtrlBase

View File

@@ -16,8 +16,8 @@
#include "wx/containr.h"
#include "wx/toplevel.h"
class WXDLLEXPORT wxSizer;
class WXDLLEXPORT wxStdDialogButtonSizer;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
#define wxDIALOG_NO_PARENT 0x0001 // Don't make owned by apps top window

View File

@@ -20,7 +20,7 @@
// misc
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com")

View File

@@ -25,13 +25,13 @@
extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
#endif // wxUSE_DISPLAY
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxPoint;
class WXDLLEXPORT wxRect;
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxPoint;
class WXDLLIMPEXP_FWD_CORE wxRect;
class WXDLLIMPEXP_FWD_BASE wxString;
class WXDLLEXPORT wxDisplayFactory;
class WXDLLEXPORT wxDisplayImpl;
class WXDLLIMPEXP_FWD_CORE wxDisplayFactory;
class WXDLLIMPEXP_FWD_CORE wxDisplayImpl;
// ----------------------------------------------------------------------------
// wxDisplay: represents a display/monitor attached to the system

View File

@@ -18,8 +18,8 @@
#include "wx/pickerbase.h"
class WXDLLIMPEXP_CORE wxDialog;
class WXDLLIMPEXP_CORE wxFileDirPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[];
extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[];

View File

@@ -22,10 +22,10 @@
extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
// ----------------------------------------------------------------------------
// constants

View File

@@ -17,9 +17,9 @@
#include "wx/dialog.h"
class WXDLLIMPEXP_ADV wxAboutDialogInfo;
class WXDLLIMPEXP_CORE wxSizer;
class WXDLLIMPEXP_CORE wxSizerFlags;
class WXDLLIMPEXP_FWD_ADV wxAboutDialogInfo;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
// ----------------------------------------------------------------------------
// wxGenericAboutDialog: generic "About" dialog implementation

View File

@@ -14,8 +14,8 @@
#if wxUSE_BUSYINFO
class WXDLLIMPEXP_CORE wxFrame;
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxWindow;
//--------------------------------------------------------------------------------
// wxBusyInfo

View File

@@ -15,9 +15,9 @@
#include "wx/control.h" // the base class
#include "wx/dcclient.h" // for wxPaintDC
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#define wxCalendarNameStr _T("CalendarCtrl")

View File

@@ -13,8 +13,8 @@
#define _WX_COLLAPSABLE_PANE_H_GENERIC_
// forward declared
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticLine;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxStaticLine;
// class name
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];

View File

@@ -30,9 +30,9 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_BASE wxHashTable;
//-----------------------------------------------------------------------------
// Extra styles for wxGenericDirCtrl

View File

@@ -55,21 +55,21 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxGrid;
class WXDLLIMPEXP_ADV wxGridCellAttr;
class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
class WXDLLIMPEXP_ADV wxGridColLabelWindow;
class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
class WXDLLIMPEXP_ADV wxGridWindow;
class WXDLLIMPEXP_ADV wxGridTypeRegistry;
class WXDLLIMPEXP_ADV wxGridSelection;
class WXDLLIMPEXP_FWD_ADV wxGrid;
class WXDLLIMPEXP_FWD_ADV wxGridCellAttr;
class WXDLLIMPEXP_FWD_ADV wxGridCellAttrProviderData;
class WXDLLIMPEXP_FWD_ADV wxGridColLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridCornerLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridRowLabelWindow;
class WXDLLIMPEXP_FWD_ADV wxGridWindow;
class WXDLLIMPEXP_FWD_ADV wxGridTypeRegistry;
class WXDLLIMPEXP_FWD_ADV wxGridSelection;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
#if wxUSE_SPINCTRL
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#endif
// ----------------------------------------------------------------------------

View File

@@ -79,7 +79,7 @@ private:
wxGrid *m_grid;
wxGrid::wxGridSelectionModes m_selectionMode;
friend class WXDLLIMPEXP_ADV wxGrid;
friend class WXDLLIMPEXP_FWD_ADV wxGrid;
DECLARE_NO_COPY_CLASS(wxGridSelection)
};

View File

@@ -27,13 +27,13 @@
#include "wx/dcps.h"
#endif
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxStaticText;
class WXDLLEXPORT wxRadioBox;
class WXDLLEXPORT wxPageSetupData;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxRadioBox;
class WXDLLIMPEXP_FWD_CORE wxPageSetupData;
// ----------------------------------------------------------------------------
// constants

View File

@@ -18,7 +18,7 @@
#include "wx/dialog.h"
class WXDLLIMPEXP_CORE wxBookCtrlBase;
class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
//-----------------------------------------------------------------------------
// wxPropertySheetDialog

View File

@@ -21,14 +21,14 @@
// forward declaration
// -----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericTreeItem;
class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;
class WXDLLEXPORT wxTreeItemData;
class WXDLLIMPEXP_FWD_CORE wxTreeItemData;
class WXDLLEXPORT wxTreeRenameTimer;
class WXDLLEXPORT wxTreeFindTimer;
class WXDLLEXPORT wxTreeTextCtrl;
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeRenameTimer;
class WXDLLIMPEXP_FWD_CORE wxTreeFindTimer;
class WXDLLIMPEXP_FWD_CORE wxTreeTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// -----------------------------------------------------------------------------
// wxGenericTreeCtrl - the tree control

View File

@@ -32,8 +32,8 @@
#include "wx/html/helpwnd.h"
#include "wx/html/htmprint.h"
class WXDLLIMPEXP_HTML wxHtmlHelpController;
class WXDLLIMPEXP_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
{

View File

@@ -20,10 +20,10 @@
#include "wx/filesys.h"
#endif // wxUSE_FILESYSTEM
class WXDLLIMPEXP_HTML wxHtmlCell;
class WXDLLIMPEXP_HTML wxHtmlWinParser;
class WXDLLIMPEXP_HTML wxHtmlListBoxCache;
class WXDLLIMPEXP_HTML wxHtmlListBoxStyle;
class WXDLLIMPEXP_FWD_HTML wxHtmlCell;
class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache;
class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle;
extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxHtmlListBoxNameStr[];
extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxSimpleHtmlListBoxNameStr[];

View File

@@ -549,7 +549,7 @@ DECLARE_LOG_FUNCTION(Status);
#if wxUSE_GUI
// this one is the same as previous except that it allows to explicitly
class WXDLLEXPORT wxFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
// specify the frame to which the output should go
DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *, pFrame, WXDLLIMPEXP_CORE);
#endif // wxUSE_GUI

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

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

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

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

View File

@@ -28,8 +28,8 @@
// internal code
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxOverlayImpl;
class WXDLLEXPORT wxWindowDC;
class WXDLLIMPEXP_FWD_CORE wxOverlayImpl;
class WXDLLIMPEXP_FWD_CORE wxWindowDC;
class WXDLLEXPORT wxOverlay
{

View File

@@ -16,8 +16,8 @@
#include "wx/sizer.h"
#include "wx/containr.h"
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLEXPORT wxToolTip;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxToolTip;
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];

View File

@@ -22,8 +22,8 @@
* For conditions of distribution and use, see the accompanying README file.
*/
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxPalette;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxPalette;
/*
* wxQuantize

View File

@@ -27,7 +27,7 @@
#define wxRICHTEXT_BUFFERED_PAINTING 0
#endif
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleDefinition;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition;
/*!
* Styles and flags

View File

@@ -30,8 +30,8 @@
#include "wx/richtext/richtextbuffer.h"
#include "wx/richtext/richtextstyles.h"
class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog;
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
class WXDLLIMPEXP_FWD_CORE wxImageList;
/*!
* Flags determining the pages and buttons to be created in the dialog

View File

@@ -36,8 +36,8 @@
* Forward declarations
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCtrl;
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
/*!
* wxRichTextStyleDefinition class declaration

View File

@@ -18,8 +18,8 @@
#include "wx/bookctrl.h"
class WXDLLEXPORT wxToolBarBase;
class WXDLLEXPORT wxCommandEvent;
class WXDLLIMPEXP_FWD_CORE wxToolBarBase;
class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;

View File

@@ -22,7 +22,7 @@
typedef wxWindow wxTreebookPage;
class WXDLLEXPORT wxTreeEvent;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
// ----------------------------------------------------------------------------
// wxTreebook

View File

@@ -565,7 +565,7 @@ wxDEPRECATED(
);
#if wxUSE_ACCEL
class WXDLLEXPORT wxAcceleratorEntry;
class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
// use wxAcceleratorEntry::Create() or FromString() methods instead
wxDEPRECATED(

View File

@@ -14,8 +14,8 @@
#if wxUSE_IMAGE && wxUSE_XPM
class WXDLLIMPEXP_CORE wxImage;
class WXDLLIMPEXP_BASE wxInputStream;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_BASE wxInputStream;
// --------------------------------------------------------------------------
// wxXPMDecoder class

View File

@@ -15,7 +15,7 @@
#if wxUSE_XRC && wxUSE_COLLPANE
class WXDLLIMPEXP_ADV wxCollapsiblePane;
class WXDLLIMPEXP_FWD_ADV wxCollapsiblePane;
class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
{

View File

@@ -15,7 +15,7 @@
#if wxUSE_XRC && wxUSE_MDI
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
{

View File

@@ -18,7 +18,7 @@
#include "wx/sizer.h"
#include "wx/gbsizer.h"
class WXDLLEXPORT wxSizer;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
{

View File

@@ -44,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{
friend class WXDLLEXPORT wxAcceleratorTable;
friend class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
public:
wxAcceleratorRefData();
virtual ~wxAcceleratorRefData();

View File

@@ -123,7 +123,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
class wxCheckListBoxItem : public wxOwnerDrawn
{
friend class WXDLLEXPORT wxCheckListBox;
friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
public:
// ctor
wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);

View File

@@ -163,7 +163,7 @@ struct WXDLLEXPORT wxRasThreadData
HANDLE hEventRas, // automatic event which RAS signals when status changes
hEventQuit; // manual event which we signal when we terminate
class WXDLLEXPORT wxDialUpManagerMSW *dialUpManager; // the owner
class WXDLLIMPEXP_FWD_CORE wxDialUpManagerMSW *dialUpManager; // the owner
};
// ----------------------------------------------------------------------------

View File

@@ -44,7 +44,7 @@
#include <ctype.h>
// in case we're compiling in non-GUI mode
class WXDLLEXPORT wxIcon;
class WXDLLIMPEXP_FWD_CORE wxIcon;
// These classes use Windows registry to retrieve the required information.
//