Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport the WXDLLIMPEXP_FWD_XXX macros to 2.8 (patches 1822143 and 1822146)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-31 20:46:21 +00:00
parent 7d75181ca1
commit ba678694f0
74 changed files with 289 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@@ -91,6 +91,11 @@ Major new features in 2.8 release
2.8.7
-----
wxMSW:
- Correct (harmless) warnings given for forward-declared DLL-exported classes
by mingw32 4.2 (Tim Stahlhut)
wxGTK:
- Added gtk.window.force-background-colour wxSystemOptions option to work around

6
include/wx/accel.h
View File

@@ -18,9 +18,9 @@
#include "wx/object.h"
class WXDLLEXPORT wxAcceleratorTable;
class WXDLLEXPORT wxMenuItem;
class WXDLLEXPORT wxKeyEvent;
class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
class WXDLLIMPEXP_FWD_CORE wxMenuItem;
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
// ----------------------------------------------------------------------------
// constants

4
include/wx/animdecod.h
View File

@@ -17,8 +17,8 @@
#include "wx/colour.h"
#include "wx/gdicmn.h"
class WXDLLIMPEXP_BASE wxInputStream;
class WXDLLIMPEXP_CORE wxImage;
class WXDLLIMPEXP_FWD_BASE wxInputStream;
class WXDLLIMPEXP_FWD_CORE wxImage;
/*

12
include/wx/app.h
View File

@@ -22,15 +22,15 @@
#include "wx/init.h" // we must declare wxEntry()
#include "wx/intl.h" // for wxLayoutDirection
class WXDLLIMPEXP_BASE wxAppConsole;
class WXDLLIMPEXP_BASE wxAppTraits;
class WXDLLIMPEXP_BASE wxCmdLineParser;
class WXDLLIMPEXP_BASE wxLog;
class WXDLLIMPEXP_BASE wxMessageOutput;
class WXDLLIMPEXP_FWD_BASE wxAppConsole;
class WXDLLIMPEXP_FWD_BASE wxAppTraits;
class WXDLLIMPEXP_FWD_BASE wxCmdLineParser;
class WXDLLIMPEXP_FWD_BASE wxLog;
class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
#if wxUSE_GUI
class WXDLLEXPORT wxEventLoop;
struct WXDLLIMPEXP_CORE wxVideoMode;
struct WXDLLIMPEXP_FWD_CORE wxVideoMode;
#endif
// ----------------------------------------------------------------------------

12
include/wx/bitmap.h
View File

@@ -20,12 +20,12 @@
#include "wx/gdicmn.h" // for wxBitmapType
#include "wx/colour.h"
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxBitmapHandler;
class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxPalette;
// ----------------------------------------------------------------------------
// wxVariant support

4
include/wx/bookctrl.h
View File

@@ -25,8 +25,8 @@
WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxBookCtrlBaseEvent;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxBookCtrlBaseEvent;
// ----------------------------------------------------------------------------
// constants

2
include/wx/button.h
View File

@@ -45,7 +45,7 @@
#include "wx/control.h"
class WXDLLEXPORT wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];

6
include/wx/clipbrd.h
View File

@@ -20,9 +20,9 @@
#include "wx/object.h"
#include "wx/wxchar.h"
class WXDLLEXPORT wxDataFormat;
class WXDLLEXPORT wxDataObject;
class WXDLLEXPORT wxClipboard;
class WXDLLIMPEXP_FWD_CORE wxDataFormat;
class WXDLLIMPEXP_FWD_CORE wxDataObject;
class WXDLLIMPEXP_FWD_CORE wxClipboard;
// ----------------------------------------------------------------------------
// wxClipboard represents the system clipboard. Normally, you should use

2
include/wx/cmdline.h
View File

@@ -20,7 +20,7 @@
#if wxUSE_CMDLINE_PARSER
class WXDLLIMPEXP_BASE wxDateTime;
class WXDLLIMPEXP_FWD_BASE wxDateTime;
// ----------------------------------------------------------------------------
// constants

2
include/wx/confbase.h
View File

@@ -17,7 +17,7 @@
#include "wx/defs.h"
#include "wx/string.h"
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
// ----------------------------------------------------------------------------
// constants

8
include/wx/containr.h
View File

@@ -13,10 +13,10 @@
#ifndef _WX_CONTAINR_H_
#define _WX_CONTAINR_H_
class WXDLLEXPORT wxFocusEvent;
class WXDLLEXPORT wxNavigationKeyEvent;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
/*
Implementation note: wxControlContainer is not a real mix-in but rather

2
include/wx/debugrpt.h
View File

@@ -18,7 +18,7 @@
#include "wx/string.h"
#include "wx/arrstr.h"
class WXDLLIMPEXP_XML wxXmlNode;
class WXDLLIMPEXP_FWD_XML wxXmlNode;
// ----------------------------------------------------------------------------
// wxDebugReport: generate a debug report, processing is done in derived class

2
include/wx/dir.h
View File

@@ -15,7 +15,7 @@
#include "wx/longlong.h"
#include "wx/string.h"
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
// ----------------------------------------------------------------------------
// constants

26
include/wx/dlimpexp.h
View File

@@ -234,14 +234,33 @@
#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
/* wx-2.9 introduces new macros for forward declarations, include them
* here for forward compatibility: */
* here for forward compatibility:
GCC warns about using __attribute__ (and also __declspec in mingw32 case) on
forward declarations while MSVC complains about forward declarations without
__declspec for the classes later declared with it, so we need a separate set
of macros for forward declarations to hide this difference:
*/
#if defined(__WINDOWS__) && defined(__GNUC__)
#define WXDLLIMPEXP_FWD_BASE
#define WXDLLIMPEXP_FWD_NET
#define WXDLLIMPEXP_FWD_CORE
#define WXDLLIMPEXP_FWD_ADV
#define WXDLLIMPEXP_FWD_QA
#define WXDLLIMPEXP_FWD_HTML
#define WXDLLIMPEXP_FWD_GL
#define WXDLLIMPEXP_FWD_XML
#define WXDLLIMPEXP_FWD_XRC
#define WXDLLIMPEXP_FWD_AUI
#define WXDLLIMPEXP_FWD_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA
#define WXDLLIMPEXP_FWD_STC
#else
#define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE
#define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET
#define WXDLLIMPEXP_FWD_CORE WXDLLIMPEXP_CORE
#define WXDLLIMPEXP_FWD_ADV WXDLLIMPEXP_ADV
#define WXDLLIMPEXP_FWD_QA WXDLLIMPEXP_QA
#define WXDLLIMPEXP_FWD_ODBC WXDLLIMPEXP_ODBC
#define WXDLLIMPEXP_FWD_DBGRID WXDLLIMPEXP_DBGRID
#define WXDLLIMPEXP_FWD_HTML WXDLLIMPEXP_HTML
#define WXDLLIMPEXP_FWD_GL WXDLLIMPEXP_GL
#define WXDLLIMPEXP_FWD_XML WXDLLIMPEXP_XML
@@ -250,6 +269,7 @@
#define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA
#define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC
#endif
#endif /* _WX_DLIMPEXP_H_ */

18
include/wx/docview.h
View File

@@ -24,15 +24,15 @@
#include "wx/print.h"
#endif
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxDocument;
class WXDLLEXPORT wxView;
class WXDLLEXPORT wxDocTemplate;
class WXDLLEXPORT wxDocManager;
class WXDLLEXPORT wxPrintInfo;
class WXDLLEXPORT wxCommandProcessor;
class WXDLLEXPORT wxFileHistory;
class WXDLLEXPORT wxConfigBase;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxDocument;
class WXDLLIMPEXP_FWD_CORE wxView;
class WXDLLIMPEXP_FWD_CORE wxDocTemplate;
class WXDLLIMPEXP_FWD_CORE wxDocManager;
class WXDLLIMPEXP_FWD_CORE wxPrintInfo;
class WXDLLIMPEXP_FWD_CORE wxCommandProcessor;
class WXDLLIMPEXP_FWD_CORE wxFileHistory;
class WXDLLIMPEXP_FWD_CORE wxConfigBase;
#if wxUSE_STD_IOSTREAM
#include "wx/iosfwrap.h"

10
include/wx/event.h
View File

@@ -30,13 +30,13 @@
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxList;
class WXDLLIMPEXP_FWD_BASE wxList;
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxDC;
class WXDLLIMPEXP_CORE wxMenu;
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_CORE wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
#endif // wxUSE_GUI
class WXDLLIMPEXP_BASE wxEvtHandler;

10
include/wx/fileconf.h
View File

@@ -89,13 +89,13 @@
(it's on by default, the current status can be retrieved with
IsExpandingEnvVars function).
*/
class WXDLLIMPEXP_BASE wxFileConfigGroup;
class WXDLLIMPEXP_BASE wxFileConfigEntry;
class WXDLLIMPEXP_BASE wxFileConfigLineList;
class WXDLLIMPEXP_FWD_BASE wxFileConfigGroup;
class WXDLLIMPEXP_FWD_BASE wxFileConfigEntry;
class WXDLLIMPEXP_FWD_BASE wxFileConfigLineList;
#if wxUSE_STREAMS
class WXDLLIMPEXP_BASE wxInputStream;
class WXDLLIMPEXP_BASE wxOutputStream;
class WXDLLIMPEXP_FWD_BASE wxInputStream;
class WXDLLIMPEXP_FWD_BASE wxOutputStream;
#endif // wxUSE_STREAMS
class WXDLLIMPEXP_BASE wxFileConfig : public wxConfigBase

4
include/wx/filename.h
View File

@@ -29,11 +29,11 @@
#include "wx/intl.h"
#if wxUSE_FILE
class WXDLLIMPEXP_BASE wxFile;
class WXDLLIMPEXP_FWD_BASE wxFile;
#endif
#if wxUSE_FFILE
class WXDLLIMPEXP_BASE wxFFile;
class WXDLLIMPEXP_FWD_BASE wxFFile;
#endif
// ----------------------------------------------------------------------------

8
include/wx/font.h
View File

@@ -24,10 +24,10 @@
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxFontData;
class WXDLLEXPORT wxFontBase;
class WXDLLEXPORT wxFont;
class WXDLLEXPORT wxSize;
class WXDLLIMPEXP_FWD_CORE wxFontData;
class WXDLLIMPEXP_FWD_CORE wxFontBase;
class WXDLLIMPEXP_FWD_CORE wxFont;
class WXDLLIMPEXP_FWD_CORE wxSize;
// ----------------------------------------------------------------------------
// font constants

6
include/wx/fontmap.h
View File

@@ -25,13 +25,13 @@
#endif // wxUSE_GUI
#if wxUSE_CONFIG && wxUSE_FILECONFIG
class WXDLLIMPEXP_BASE wxConfigBase;
class WXDLLIMPEXP_FWD_BASE wxConfigBase;
#endif // wxUSE_CONFIG
class WXDLLIMPEXP_CORE wxFontMapper;
class WXDLLIMPEXP_FWD_CORE wxFontMapper;
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
#endif // wxUSE_GUI
// ============================================================================

4
include/wx/fontutil.h
View File

@@ -26,8 +26,8 @@
#include "wx/msw/wrapwin.h"
#endif
class WXDLLIMPEXP_BASE wxArrayString;
struct WXDLLEXPORT wxNativeEncodingInfo;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo;
#if defined(_WX_X_FONTLIKE)

4
include/wx/fs_mem.h
View File

@@ -16,8 +16,8 @@
#include "wx/filesys.h"
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxBitmap;
class WXDLLIMPEXP_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxImage;
#endif // wxUSE_GUI
// ----------------------------------------------------------------------------

20
include/wx/gdicmn.h
View File

@@ -27,16 +27,16 @@
// forward declarations
// ---------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxBitmap;
class WXDLLIMPEXP_CORE wxBrush;
class WXDLLIMPEXP_CORE wxColour;
class WXDLLIMPEXP_CORE wxCursor;
class WXDLLIMPEXP_CORE wxFont;
class WXDLLIMPEXP_CORE wxIcon;
class WXDLLIMPEXP_CORE wxPalette;
class WXDLLIMPEXP_CORE wxPen;
class WXDLLIMPEXP_CORE wxRegion;
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxBrush;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxFont;
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxPalette;
class WXDLLIMPEXP_FWD_CORE wxPen;
class WXDLLIMPEXP_FWD_CORE wxRegion;
class WXDLLIMPEXP_FWD_BASE wxString;
// ---------------------------------------------------------------------------
// constants

2
include/wx/generic/choicdgg.h
View File

@@ -15,7 +15,7 @@
#include "wx/dynarray.h"
#include "wx/dialog.h"
class WXDLLEXPORT wxListBoxBase;
class WXDLLIMPEXP_FWD_CORE wxListBoxBase;
// ----------------------------------------------------------------------------
// some (ugly...) constants

4
include/wx/generic/laywin.h
View File

@@ -196,8 +196,8 @@ private:
#endif // wxUSE_SASH
class WXDLLEXPORT wxMDIParentFrame;
class WXDLLEXPORT wxFrame;
class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
// This class implements the layout algorithm
class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject

4
include/wx/generic/numdlgg.h
View File

@@ -19,9 +19,9 @@
#include "wx/dialog.h"
#if wxUSE_SPINCTRL
class WXDLLEXPORT wxSpinCtrl;
class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
#else
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
#endif // wxUSE_SPINCTRL
// ----------------------------------------------------------------------------

2
include/wx/generic/panelg.h
View File

@@ -19,7 +19,7 @@
#include "wx/window.h"
#include "wx/containr.h"
class WXDLLEXPORT wxControlContainer;
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];

8
include/wx/generic/progdlgg.h
View File

@@ -19,9 +19,9 @@
#include "wx/dialog.h"
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxGauge;
class WXDLLEXPORT wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxGauge;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
/* Progress dialog which shows a moving progress bar.
Taken from the Mahogany project.*/
@@ -161,7 +161,7 @@ private:
#endif // __WXMSW__
// for wxPD_APP_MODAL case
class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxProgressDialog)

2
include/wx/generic/splitter.h
View File

@@ -367,7 +367,7 @@ public:
}
private:
friend class WXDLLEXPORT wxSplitterWindow;
friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;
// data for the different types of event
union

2
include/wx/generic/textdlgg.h
View File

@@ -22,7 +22,7 @@
#include "wx/valtext.h"
#endif
class WXDLLEXPORT wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];

10
include/wx/generic/wizard.h
View File

@@ -16,11 +16,11 @@
// wxWizard
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticBitmap;
class WXDLLIMPEXP_ADV wxWizardEvent;
class WXDLLEXPORT wxBoxSizer;
class WXDLLIMPEXP_ADV wxWizardSizer;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
class WXDLLIMPEXP_FWD_ADV wxWizardEvent;
class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
class WXDLLIMPEXP_FWD_ADV wxWizardSizer;
class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase
{

8
include/wx/hash.h
View File

@@ -109,12 +109,12 @@ union wxHashKeyValue
// for some compilers (AIX xlC), defining it as friend inside the class is not
// enough, so provide a real forward declaration
class WXDLLIMPEXP_BASE wxHashTableBase;
class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
class WXDLLIMPEXP_BASE wxHashTableBase_Node
{
friend class WXDLLIMPEXP_BASE wxHashTableBase;
typedef class WXDLLIMPEXP_BASE wxHashTableBase_Node _Node;
friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node;
public:
wxHashTableBase_Node( long key, void* value,
wxHashTableBase* table );
@@ -154,7 +154,7 @@ class WXDLLIMPEXP_BASE wxHashTableBase
: public wxObject
#endif
{
friend class WXDLLIMPEXP_BASE wxHashTableBase_Node;
friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node;
public:
typedef wxHashTableBase_Node Node;

8
include/wx/html/helpctrl.h
View File

@@ -35,10 +35,10 @@
// Make the dialog modal when displaying help.
#define wxHF_MODAL 0x00040000
class WXDLLIMPEXP_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpFrame;
class WXDLLIMPEXP_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpFrame;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
{

14
include/wx/html/helpfrm.h
View File

@@ -32,10 +32,10 @@
#include "wx/html/helpwnd.h"
#include "wx/html/htmprint.h"
class WXDLLIMPEXP_CORE wxButton;
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxTreeEvent;
class WXDLLIMPEXP_CORE wxTreeCtrl;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
// style flags for the Help Frame
@@ -62,9 +62,9 @@ class WXDLLIMPEXP_CORE wxTreeCtrl;
struct wxHtmlHelpMergedIndexItem;
class wxHtmlHelpMergedIndex;
class WXDLLIMPEXP_CORE wxHelpControllerBase;
class WXDLLIMPEXP_HTML wxHtmlHelpController;
class WXDLLIMPEXP_CORE wxHtmlHelpWindow;
class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
class WXDLLIMPEXP_FWD_CORE wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame
{

12
include/wx/html/helpwnd.h
View File

@@ -31,10 +31,10 @@
#include "wx/html/htmlwin.h"
#include "wx/html/htmprint.h"
class WXDLLIMPEXP_CORE wxButton;
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxTreeEvent;
class WXDLLIMPEXP_CORE wxTreeCtrl;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
// style flags for the Help Frame
#define wxHF_TOOLBAR 0x0001
@@ -67,8 +67,8 @@ struct wxHtmlHelpFrameCfg
struct wxHtmlHelpMergedIndexItem;
class wxHtmlHelpMergedIndex;
class WXDLLIMPEXP_CORE wxHelpControllerBase;
class WXDLLIMPEXP_HTML wxHtmlHelpController;
class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase;
class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
/*!
* Help window

8
include/wx/html/htmlpars.h
View File

@@ -18,10 +18,10 @@
#include "wx/hash.h"
#include "wx/fontenc.h"
class WXDLLIMPEXP_BASE wxMBConv;
class WXDLLIMPEXP_HTML wxHtmlParser;
class WXDLLIMPEXP_HTML wxHtmlTagHandler;
class WXDLLIMPEXP_HTML wxHtmlEntitiesParser;
class WXDLLIMPEXP_FWD_BASE wxMBConv;
class WXDLLIMPEXP_FWD_HTML wxHtmlParser;
class WXDLLIMPEXP_FWD_HTML wxHtmlTagHandler;
class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;
class wxHtmlTextPieces;
class wxHtmlParserState;

4
include/wx/html/htmltag.h
View File

@@ -17,8 +17,8 @@
#include "wx/object.h"
#include "wx/arrstr.h"
class WXDLLIMPEXP_CORE wxColour;
class WXDLLIMPEXP_HTML wxHtmlEntitiesParser;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;
//-----------------------------------------------------------------------------
// wxHtmlTagsCache

4
include/wx/iconbndl.h
View File

@@ -16,8 +16,8 @@
// for wxSize
#include "wx/gdicmn.h"
class WXDLLIMPEXP_CORE wxIcon;
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_BASE wxString;
WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );

8
include/wx/image.h
View File

@@ -61,9 +61,9 @@ const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxImageHandler;
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxPalette;
class WXDLLIMPEXP_FWD_CORE wxImageHandler;
class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxPalette;
//-----------------------------------------------------------------------------
// wxVariant support
@@ -423,7 +423,7 @@ protected:
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
private:
friend class WXDLLEXPORT wxImageHandler;
friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
DECLARE_DYNAMIC_CLASS(wxImage)
};

4
include/wx/layout.h
View File

@@ -32,8 +32,8 @@
// forward declrations
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxWindowBase;
class WXDLLEXPORT wxLayoutConstraints;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints;
// ----------------------------------------------------------------------------
// constants

2
include/wx/list.h
View File

@@ -503,7 +503,7 @@ class WXDLLIMPEXP_BASE wxList;
class WXDLLIMPEXP_BASE wxListBase : public wxObject
{
friend class WXDLLIMPEXP_BASE wxNodeBase; // should be able to call DetachNode()
friend class WXDLLIMPEXP_FWD_BASE wxNodeBase; // should be able to call DetachNode()
friend class wxHashTableBase; // should be able to call untyped Find()
public:

4
include/wx/listbook.h
View File

@@ -18,8 +18,8 @@
#include "wx/bookctrl.h"
class WXDLLEXPORT wxListView;
class WXDLLEXPORT wxListEvent;
class WXDLLIMPEXP_FWD_CORE wxListView;
class WXDLLIMPEXP_FWD_CORE wxListEvent;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;

4
include/wx/listbox.h
View File

@@ -23,8 +23,8 @@
#include "wx/ctrlsub.h" // base class
// forward declarations are enough here
class WXDLLIMPEXP_BASE wxArrayInt;
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayInt;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
// ----------------------------------------------------------------------------
// global data

8
include/wx/log.h
View File

@@ -69,10 +69,10 @@ typedef unsigned long wxLogLevel;
// ----------------------------------------------------------------------------
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxLogFrame;
class WXDLLIMPEXP_CORE wxFrame;
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxLogFrame;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxWindow;
#endif // wxUSE_GUI
// ----------------------------------------------------------------------------

8
include/wx/menu.h
View File

@@ -27,10 +27,10 @@
// included wx/menu.h
#include "wx/menuitem.h"
class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuBarBase;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenuItem;
class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLIMPEXP_FWD_CORE wxMenuBarBase;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxMenuItem;
// pseudo template list classes
WX_DECLARE_EXPORTED_LIST(wxMenu, wxMenuList);

6
include/wx/menuitem.h
View File

@@ -26,9 +26,9 @@
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxAcceleratorEntry;
class WXDLLEXPORT wxMenuItem;
class WXDLLEXPORT wxMenu;
class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
class WXDLLIMPEXP_FWD_CORE wxMenuItem;
class WXDLLIMPEXP_FWD_CORE wxMenu;
// ----------------------------------------------------------------------------
// wxMenuItem is an item in the menu which may be either a normal item, a sub

6
include/wx/mimetype.h
View File

@@ -27,9 +27,9 @@
#include "wx/arrstr.h"
// fwd decls
class WXDLLIMPEXP_BASE wxIconLocation;
class WXDLLIMPEXP_BASE wxFileTypeImpl;
class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl;
class WXDLLIMPEXP_FWD_BASE wxIconLocation;
class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl;
// these constants define the MIME informations source under UNIX and are used
// by wxMimeTypesManager::Initialize()

10
include/wx/msw/app.h
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

24
include/wx/msw/bitmap.h
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

4
include/wx/msw/checklst.h
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
{

2
include/wx/msw/clipbrd.h
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)

4
include/wx/msw/listbox.h
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

2
include/wx/msw/listctrl.h
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:

4
include/wx/msw/menu.h
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

4
include/wx/msw/ole/dropsrc.h
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

6
include/wx/msw/private.h
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

2
include/wx/msw/registry.h
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

2
include/wx/msw/tooltip.h
View File

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

6
include/wx/msw/treectrl.h
View File

@@ -30,9 +30,9 @@
#endif // Cygwin
// fwd decl
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxDragImage;
struct WXDLLEXPORT wxTreeViewItem;
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxDragImage;
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

30
include/wx/prntbase.h
View File

@@ -23,21 +23,21 @@
#include "wx/dialog.h"
#include "wx/frame.h"
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxChoice;
class WXDLLEXPORT wxPrintout;
class WXDLLEXPORT wxPrinterBase;
class WXDLLEXPORT wxPrintDialogBase;
class WXDLLEXPORT wxPrintDialog;
class WXDLLEXPORT wxPageSetupDialogBase;
class WXDLLEXPORT wxPageSetupDialog;
class WXDLLEXPORT wxPrintPreviewBase;
class WXDLLEXPORT wxPreviewCanvas;
class WXDLLEXPORT wxPreviewControlBar;
class WXDLLEXPORT wxPreviewFrame;
class WXDLLEXPORT wxPrintFactory;
class WXDLLEXPORT wxPrintNativeDataBase;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxChoice;
class WXDLLIMPEXP_FWD_CORE wxPrintout;
class WXDLLIMPEXP_FWD_CORE wxPrinterBase;
class WXDLLIMPEXP_FWD_CORE wxPrintDialogBase;
class WXDLLIMPEXP_FWD_CORE wxPrintDialog;
class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogBase;
class WXDLLIMPEXP_FWD_CORE wxPageSetupDialog;
class WXDLLIMPEXP_FWD_CORE wxPrintPreviewBase;
class WXDLLIMPEXP_FWD_CORE wxPreviewCanvas;
class WXDLLIMPEXP_FWD_CORE wxPreviewControlBar;
class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
//----------------------------------------------------------------------------
// error consts

2
include/wx/regex.h
View File

@@ -16,7 +16,7 @@
#if wxUSE_REGEX
class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_FWD_BASE wxString;
// ----------------------------------------------------------------------------
// constants

6
include/wx/region.h
View File

@@ -15,9 +15,9 @@
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
class WXDLLIMPEXP_CORE wxBitmap;
class WXDLLEXPORT wxColour;
class WXDLLEXPORT wxRegion;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_FWD_CORE wxRegion;
// ----------------------------------------------------------------------------
// constants

4
include/wx/renderer.h
View File

@@ -25,8 +25,8 @@
#ifndef _WX_RENDERER_H_
#define _WX_RENDERER_H_
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxWindow;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxWindow;
#include "wx/gdicmn.h" // for wxPoint
#include "wx/colour.h"

4
include/wx/scrolwin.h
View File

@@ -14,8 +14,8 @@
#include "wx/panel.h"
class WXDLLEXPORT wxScrollHelperEvtHandler;
class WXDLLEXPORT wxTimer;
class WXDLLIMPEXP_FWD_CORE wxScrollHelperEvtHandler;
class WXDLLIMPEXP_FWD_CORE wxTimer;
// default scrolled window style: scroll in both directions
#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)

2
include/wx/settings.h
View File

@@ -15,7 +15,7 @@
#include "wx/colour.h"
#include "wx/font.h"
class WXDLLEXPORT wxWindow;
class WXDLLIMPEXP_FWD_CORE wxWindow;
// possible values for wxSystemSettings::GetFont() parameter
//

10
include/wx/sizer.h
View File

@@ -20,10 +20,10 @@
// classes
//---------------------------------------------------------------------------
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxBoxSizer;
class WXDLLEXPORT wxSizerItem;
class WXDLLEXPORT wxSizer;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
class WXDLLIMPEXP_FWD_CORE wxSizerItem;
class WXDLLIMPEXP_FWD_CORE wxSizer;
#ifndef wxUSE_BORDER_BY_DEFAULT
#ifdef __SMARTPHONE__
@@ -766,7 +766,7 @@ private:
#if wxUSE_STATBOX
class WXDLLEXPORT wxStaticBox;
class WXDLLIMPEXP_FWD_CORE wxStaticBox;
class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
{

2
include/wx/snglinst.h
View File

@@ -55,7 +55,7 @@ private:
void Init() { m_impl = NULL; }
// the implementation details (platform specific)
class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl *m_impl;
class WXDLLIMPEXP_FWD_BASE wxSingleInstanceCheckerImpl *m_impl;
DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
};

6
include/wx/tbarbase.h
View File

@@ -24,9 +24,9 @@
#include "wx/list.h"
#include "wx/control.h"
class WXDLLEXPORT wxToolBarBase;
class WXDLLEXPORT wxToolBarToolBase;
class WXDLLEXPORT wxImage;
class WXDLLIMPEXP_FWD_CORE wxToolBarBase;
class WXDLLIMPEXP_FWD_CORE wxToolBarToolBase;
class WXDLLIMPEXP_FWD_CORE wxImage;
// ----------------------------------------------------------------------------
// constants

2
include/wx/treectrl.h
View File

@@ -24,7 +24,7 @@
#include "wx/treebase.h"
#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
class WXDLLEXPORT wxImageList;
class WXDLLIMPEXP_FWD_CORE wxImageList;
// ----------------------------------------------------------------------------
// wxTreeCtrlBase

4
include/wx/utils.h
View File

@@ -23,8 +23,8 @@
#include "wx/gdicmn.h"
#endif
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_BASE wxArrayInt;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayInt;
// need this for wxGetDiskSpace() as we can't, unfortunately, forward declare
// wxLongLong

30
include/wx/window.h
View File

@@ -53,22 +53,22 @@
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxCaret;
class WXDLLEXPORT wxControl;
class WXDLLEXPORT wxCursor;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxDropTarget;
class WXDLLEXPORT wxItemResource;
class WXDLLEXPORT wxLayoutConstraints;
class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxSizer;
class WXDLLEXPORT wxToolTip;
class WXDLLEXPORT wxWindowBase;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxScrollHelper;
class WXDLLIMPEXP_FWD_CORE wxCaret;
class WXDLLIMPEXP_FWD_CORE wxControl;
class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxDropTarget;
class WXDLLIMPEXP_FWD_CORE wxItemResource;
class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints;
class WXDLLIMPEXP_FWD_CORE wxResourceTable;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxToolTip;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxScrollHelper;
#if wxUSE_ACCESSIBILITY
class WXDLLEXPORT wxAccessible;
class WXDLLIMPEXP_FWD_CORE wxAccessible;
#endif
// ----------------------------------------------------------------------------
@@ -1387,7 +1387,7 @@ private:
static int ms_lastControlId;
// the stack of windows which have captured the mouse
static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext;
static struct WXDLLIMPEXP_FWD_CORE wxWindowNext *ms_winCaptureNext;
// the window that currently has mouse capture
static wxWindow *ms_winCaptureCurrent;
// indicates if execution is inside CaptureMouse/ReleaseMouse

12
include/wx/xml/xml.h
View File

@@ -28,12 +28,12 @@
#define WXDLLIMPEXP_XML
#endif
class WXDLLIMPEXP_XML wxXmlNode;
class WXDLLIMPEXP_XML wxXmlProperty;
class WXDLLIMPEXP_XML wxXmlDocument;
class WXDLLIMPEXP_XML wxXmlIOHandler;
class WXDLLIMPEXP_BASE wxInputStream;
class WXDLLIMPEXP_BASE wxOutputStream;
class WXDLLIMPEXP_FWD_XML wxXmlNode;
class WXDLLIMPEXP_FWD_XML wxXmlProperty;
class WXDLLIMPEXP_FWD_XML wxXmlDocument;
class WXDLLIMPEXP_FWD_XML wxXmlIOHandler;
class WXDLLIMPEXP_FWD_BASE wxInputStream;
class WXDLLIMPEXP_FWD_BASE wxOutputStream;
// Represents XML node type.

20
include/wx/xrc/xmlres.h
View File

@@ -29,17 +29,17 @@
#include "wx/xml/xml.h"
class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxDialog;
class WXDLLEXPORT wxPanel;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar;
class WXDLLIMPEXP_FWD_CORE wxMenu;
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_FWD_CORE wxPanel;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
class WXDLLIMPEXP_XRC wxXmlResourceHandler;
class WXDLLIMPEXP_XRC wxXmlSubclassFactory;
class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList;
class WXDLLIMPEXP_FWD_XRC wxXmlResourceHandler;
class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory;
class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactoriesList;
class wxXmlResourceModule;

4
utils/wxrc/wxrc.cpp
View File

@@ -559,7 +559,7 @@ static wxString FileToCppArray(wxString filename, int num)
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
const size_t lng = wx_truncate_cast(size_t, offset);
wxASSERT_MSG( lng == offset, wxT("Huge file not supported") );
wxASSERT_MSG( !(lng - offset), wxT("Huge file not supported") );
snum.Printf(_T("%i"), num);
output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
@@ -712,7 +712,7 @@ static wxString FileToPythonArray(wxString filename, int num)
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
const size_t lng = wx_truncate_cast(size_t, offset);
wxASSERT_MSG( offset == lng, wxT("Huge file not supported") );
wxASSERT_MSG( !(offset - lng), wxT("Huge file not supported") );
snum.Printf(_T("%i"), num);
output = _T(" xml_res_file_") + snum + _T(" = '''\\\n");