AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for MSW/DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-04 13:33:42 +00:00
parent a903585074
commit 30dc34551b
75 changed files with 148 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/build/xrc/xrc.bkl
View File

@ -98,12 +98,14 @@
</headers> </headers>
<dll id="xrcdll" template="wx_contrib_dll" cond="SHARED=='1'"> <dll id="xrcdll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXMAKINGDLL</define> <define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XRC</define>
<include>$(SRCDIR)/expat/xmlparse</include> <include>$(SRCDIR)/expat/xmlparse</include>
<include>$(SRCDIR)/expat/xmltok</include> <include>$(SRCDIR)/expat/xmltok</include>
<sources>$(XRC_SRC)</sources> <sources>$(XRC_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll> </dll>
<lib id="xrclib" template="wx_contrib_lib" cond="SHARED=='0'"> <lib id="xrclib" template="wx_contrib_lib" cond="SHARED=='0'">

4
contrib/include/wx/xrc/xh_bmp.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler) DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
public: public:
@ -27,7 +27,7 @@ public:
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
}; };
class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxIconXmlHandler) DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_bmpbt.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_bttn.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_cald.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_chckb.h
View File

@ -20,7 +20,7 @@
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_chckl.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler) DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_choic.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler) DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_combo.h
View File

@ -19,7 +19,7 @@
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_dlg.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler) DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_frame.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler) DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_gauge.h
View File

@ -22,7 +22,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler) DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
enum enum

2
contrib/include/wx/xrc/xh_gdctl.h
View File

@ -19,7 +19,7 @@
#if wxUSE_DIRDLG #if wxUSE_DIRDLG
class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_html.h
View File

@ -21,7 +21,7 @@
#if wxUSE_HTML #if wxUSE_HTML
class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_listb.h
View File

@ -19,7 +19,7 @@
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_listc.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
public: public:

4
contrib/include/wx/xrc/xh_menu.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler) DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
public: public:
@ -29,7 +29,7 @@ private:
bool m_insideMenu; bool m_insideMenu;
}; };
class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_notbk.h
View File

@ -20,7 +20,7 @@
class WXDLLEXPORT wxNotebook; class WXDLLEXPORT wxNotebook;
class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler) DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_panel.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler) DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_radbt.h
View File

@ -20,7 +20,7 @@
#if wxUSE_RADIOBOX #if wxUSE_RADIOBOX
class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_radbx.h
View File

@ -19,7 +19,7 @@
#if wxUSE_RADIOBOX #if wxUSE_RADIOBOX
class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_scrol.h
View File

@ -20,7 +20,7 @@
class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
enum enum

2
contrib/include/wx/xrc/xh_scwin.h
View File

@ -20,7 +20,7 @@
class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_sizer.h
View File

@ -20,7 +20,7 @@
class WXDLLEXPORT wxSizer; class WXDLLEXPORT wxSizer;
class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler) DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_slidr.h
View File

@ -20,7 +20,7 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler) DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
enum enum

4
contrib/include/wx/xrc/xh_spin.h
View File

@ -19,7 +19,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
enum enum
@ -37,7 +37,7 @@ public:
#endif #endif
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
enum enum

2
contrib/include/wx/xrc/xh_split.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_stbmp.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_stbox.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_stlin.h
View File

@ -19,7 +19,7 @@
#if wxUSE_STATLINE #if wxUSE_STATLINE
class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_sttxt.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_text.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_toolb.h
View File

@ -21,7 +21,7 @@
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_tree.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_unkwn.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler) DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
public: public:

2
contrib/include/wx/xrc/xh_wizrd.h
View File

@ -21,7 +21,7 @@
#include "wx/wizard.h" #include "wx/wizard.h"
class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler) DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
public: public:

24
contrib/include/wx/xrc/xml.h
View File

@ -20,16 +20,18 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"
#ifdef WXXMLISDLL #ifdef WXMAKINGDLL_XRC
#define WXXMLDLLEXPORT WXDLLEXPORT #define WXDLLIMPEXP_XRC WXEXPORT
#else #elif defined(WXUSINGDLL)
#define WXXMLDLLEXPORT #define WXDLLIMPEXP_XRC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_XRC
#endif #endif
class WXXMLDLLEXPORT wxXmlNode; class WXDLLIMPEXP_XRC wxXmlNode;
class WXXMLDLLEXPORT wxXmlProperty; class WXDLLIMPEXP_XRC wxXmlProperty;
class WXXMLDLLEXPORT wxXmlDocument; class WXDLLIMPEXP_XRC wxXmlDocument;
class WXXMLDLLEXPORT wxXmlIOHandler; class WXDLLIMPEXP_XRC wxXmlIOHandler;
class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream; class WXDLLEXPORT wxOutputStream;
@ -58,7 +60,7 @@ enum wxXmlNodeType
// Example: in <img src="hello.gif" id="3"/> "src" is property with value // Example: in <img src="hello.gif" id="3"/> "src" is property with value
// "hello.gif" and "id" is prop. with value "3". // "hello.gif" and "id" is prop. with value "3".
class WXXMLDLLEXPORT wxXmlProperty class WXDLLIMPEXP_XRC wxXmlProperty
{ {
public: public:
wxXmlProperty() : m_next(NULL) {} wxXmlProperty() : m_next(NULL) {}
@ -91,7 +93,7 @@ private:
// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
// (default is UTF-8). // (default is UTF-8).
class WXXMLDLLEXPORT wxXmlNode class WXDLLIMPEXP_XRC wxXmlNode
{ {
public: public:
wxXmlNode() : m_properties(NULL), m_parent(NULL), wxXmlNode() : m_properties(NULL), m_parent(NULL),
@ -161,7 +163,7 @@ private:
// This class holds XML data/document as parsed by XML parser. // This class holds XML data/document as parsed by XML parser.
class WXXMLDLLEXPORT wxXmlDocument : public wxObject class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject
{ {
public: public:
wxXmlDocument(); wxXmlDocument();

43
contrib/include/wx/xrc/xmlres.h
View File

@ -36,9 +36,9 @@ class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
class WXXMLDLLEXPORT wxXmlResourceHandler; class WXDLLIMPEXP_XRC wxXmlResourceHandler;
class WXXMLDLLEXPORT wxXmlSubclassFactory; class WXDLLIMPEXP_XRC wxXmlSubclassFactory;
class WXXMLDLLEXPORT wxXmlSubclassFactoriesList; class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList;
class wxXmlResourceModule; class wxXmlResourceModule;
@ -46,14 +46,14 @@ class wxXmlResourceModule;
// encoded in root node of XRC file as "version" property). // encoded in root node of XRC file as "version" property).
// //
// Rules for increasing version number: // Rules for increasing version number:
// - change it only if you made incompatible change to the format. Addition of new // - change it only if you made incompatible change to the format. Addition
// attribute to control handler is _not_ incompatible change, because older // of new attribute to control handler is _not_ incompatible change, because
// versions of the library may ignore it. // older versions of the library may ignore it.
// - if you change version number, follow these steps: // - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of // - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h) // the wxWindows library (see wx/version.h)
// - reset revision to 0 unless the first three are same as before, in which // - reset revision to 0 unless the first three are same as before,
// case you should increase revision by one // in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MAJOR 2
#define WX_XMLRES_CURRENT_VERSION_MINOR 3 #define WX_XMLRES_CURRENT_VERSION_MINOR 3
#define WX_XMLRES_CURRENT_VERSION_RELEASE 0 #define WX_XMLRES_CURRENT_VERSION_RELEASE 0
@ -66,7 +66,7 @@ class wxXmlResourceModule;
WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \ WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
WX_XMLRES_CURRENT_VERSION_REVISION) WX_XMLRES_CURRENT_VERSION_REVISION)
class WXXMLDLLEXPORT wxXmlResourceDataRecord class WXDLLIMPEXP_XRC wxXmlResourceDataRecord
{ {
public: public:
wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@ -78,11 +78,9 @@ public:
}; };
#ifdef WXXMLISDLL WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); wxXmlResourceDataRecords,
#else WXDLLIMPEXP_XRC);
WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
#endif
enum wxXmlResourceFlags enum wxXmlResourceFlags
{ {
@ -93,7 +91,7 @@ enum wxXmlResourceFlags
// This class holds XML resources from one or more .xml files // This class holds XML resources from one or more .xml files
// (or derived forms, either binary or zipped -- see manual for // (or derived forms, either binary or zipped -- see manual for
// details). // details).
class WXXMLDLLEXPORT wxXmlResource : public wxObject class WXDLLIMPEXP_XRC wxXmlResource : public wxObject
{ {
public: public:
// Constructor. // Constructor.
@ -125,10 +123,10 @@ public:
void InitAllHandlers(); void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says // Initialize only a specific handler (or custom handler). Convention says
// that handler name is equal to the control's name plus 'XmlHandler', for example // that handler name is equal to the control's name plus 'XmlHandler', for
// wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource
// (xmlres) can create include file that contains initialization code for // compiler (xmlres) can create include file that contains initialization
// all controls used within the resource. // code for all controls used within the resource.
void AddHandler(wxXmlResourceHandler *handler); void AddHandler(wxXmlResourceHandler *handler);
// Add a new handler at the begining of the handler list // Add a new handler at the begining of the handler list
@ -300,7 +298,7 @@ private:
// wxXmlResourceHandler is an abstract base class for resource handlers // wxXmlResourceHandler is an abstract base class for resource handlers
// capable of creating a control from an XML node. // capable of creating a control from an XML node.
class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject
{ {
DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler) DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler)
public: public:
@ -460,10 +458,11 @@ void wxXmlInitResourceModule();
// register your subclasses via wxWindows' RTTI mechanism. This class is useful // register your subclasses via wxWindows' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing // only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython). // in wxWindows ports that don't support wxRTTI (e.g. wxPython).
class WXXMLDLLEXPORT wxXmlSubclassFactory class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{ {
public: public:
// Try to create instance of given class and return it, return NULL on failure: // Try to create instance of given class and return it, return NULL on
// failure:
virtual wxObject *Create(const wxString& className) = 0; virtual wxObject *Create(const wxString& className) = 0;
virtual ~wxXmlSubclassFactory() {} virtual ~wxXmlSubclassFactory() {}
}; };

4
include/wx/xrc/xh_bmp.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler) DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
public: public:
@ -27,7 +27,7 @@ public:
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
}; };
class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxIconXmlHandler) DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
public: public:

2
include/wx/xrc/xh_bmpbt.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
public: public:

2
include/wx/xrc/xh_bttn.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
public: public:

2
include/wx/xrc/xh_cald.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
public: public:

2
include/wx/xrc/xh_chckb.h
View File

@ -20,7 +20,7 @@
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
public: public:

2
include/wx/xrc/xh_chckl.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler) DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
public: public:

2
include/wx/xrc/xh_choic.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler) DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
public: public:

2
include/wx/xrc/xh_combo.h
View File

@ -19,7 +19,7 @@
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
public: public:

2
include/wx/xrc/xh_dlg.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler) DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
public: public:

2
include/wx/xrc/xh_frame.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler) DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
public: public:

2
include/wx/xrc/xh_gauge.h
View File

@ -22,7 +22,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler) DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
enum enum

2
include/wx/xrc/xh_gdctl.h
View File

@ -19,7 +19,7 @@
#if wxUSE_DIRDLG #if wxUSE_DIRDLG
class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
public: public:

2
include/wx/xrc/xh_html.h
View File

@ -21,7 +21,7 @@
#if wxUSE_HTML #if wxUSE_HTML
class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
public: public:

2
include/wx/xrc/xh_listb.h
View File

@ -19,7 +19,7 @@
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
public: public:

2
include/wx/xrc/xh_listc.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
public: public:

4
include/wx/xrc/xh_menu.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler) DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
public: public:
@ -29,7 +29,7 @@ private:
bool m_insideMenu; bool m_insideMenu;
}; };
class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
public: public:

2
include/wx/xrc/xh_notbk.h
View File

@ -20,7 +20,7 @@
class WXDLLEXPORT wxNotebook; class WXDLLEXPORT wxNotebook;
class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler) DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
public: public:

2
include/wx/xrc/xh_panel.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler) DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
public: public:

2
include/wx/xrc/xh_radbt.h
View File

@ -20,7 +20,7 @@
#if wxUSE_RADIOBOX #if wxUSE_RADIOBOX
class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
public: public:

2
include/wx/xrc/xh_radbx.h
View File

@ -19,7 +19,7 @@
#if wxUSE_RADIOBOX #if wxUSE_RADIOBOX
class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
public: public:

2
include/wx/xrc/xh_scrol.h
View File

@ -20,7 +20,7 @@
class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
enum enum

2
include/wx/xrc/xh_scwin.h
View File

@ -20,7 +20,7 @@
class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
public: public:

2
include/wx/xrc/xh_sizer.h
View File

@ -20,7 +20,7 @@
class WXDLLEXPORT wxSizer; class WXDLLEXPORT wxSizer;
class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler) DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
public: public:

2
include/wx/xrc/xh_slidr.h
View File

@ -20,7 +20,7 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler) DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
enum enum

4
include/wx/xrc/xh_spin.h
View File

@ -19,7 +19,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler) DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
enum enum
@ -37,7 +37,7 @@ public:
#endif #endif
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
enum enum

2
include/wx/xrc/xh_split.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler) DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
public: public:

2
include/wx/xrc/xh_stbmp.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
public: public:

2
include/wx/xrc/xh_stbox.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
public: public:

2
include/wx/xrc/xh_stlin.h
View File

@ -19,7 +19,7 @@
#if wxUSE_STATLINE #if wxUSE_STATLINE
class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
public: public:

2
include/wx/xrc/xh_sttxt.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler) DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
public: public:

2
include/wx/xrc/xh_text.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
public: public:

2
include/wx/xrc/xh_toolb.h
View File

@ -21,7 +21,7 @@
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
public: public:

2
include/wx/xrc/xh_tree.h
View File

@ -17,7 +17,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler) DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
public: public:

2
include/wx/xrc/xh_unkwn.h
View File

@ -18,7 +18,7 @@
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler) DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
public: public:

2
include/wx/xrc/xh_wizrd.h
View File

@ -21,7 +21,7 @@
#include "wx/wizard.h" #include "wx/wizard.h"
class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler) DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
public: public:

24
include/wx/xrc/xml.h
View File

@ -20,16 +20,18 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"
#ifdef WXXMLISDLL #ifdef WXMAKINGDLL_XRC
#define WXXMLDLLEXPORT WXDLLEXPORT #define WXDLLIMPEXP_XRC WXEXPORT
#else #elif defined(WXUSINGDLL)
#define WXXMLDLLEXPORT #define WXDLLIMPEXP_XRC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_XRC
#endif #endif
class WXXMLDLLEXPORT wxXmlNode; class WXDLLIMPEXP_XRC wxXmlNode;
class WXXMLDLLEXPORT wxXmlProperty; class WXDLLIMPEXP_XRC wxXmlProperty;
class WXXMLDLLEXPORT wxXmlDocument; class WXDLLIMPEXP_XRC wxXmlDocument;
class WXXMLDLLEXPORT wxXmlIOHandler; class WXDLLIMPEXP_XRC wxXmlIOHandler;
class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream; class WXDLLEXPORT wxOutputStream;
@ -58,7 +60,7 @@ enum wxXmlNodeType
// Example: in <img src="hello.gif" id="3"/> "src" is property with value // Example: in <img src="hello.gif" id="3"/> "src" is property with value
// "hello.gif" and "id" is prop. with value "3". // "hello.gif" and "id" is prop. with value "3".
class WXXMLDLLEXPORT wxXmlProperty class WXDLLIMPEXP_XRC wxXmlProperty
{ {
public: public:
wxXmlProperty() : m_next(NULL) {} wxXmlProperty() : m_next(NULL) {}
@ -91,7 +93,7 @@ private:
// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
// (default is UTF-8). // (default is UTF-8).
class WXXMLDLLEXPORT wxXmlNode class WXDLLIMPEXP_XRC wxXmlNode
{ {
public: public:
wxXmlNode() : m_properties(NULL), m_parent(NULL), wxXmlNode() : m_properties(NULL), m_parent(NULL),
@ -161,7 +163,7 @@ private:
// This class holds XML data/document as parsed by XML parser. // This class holds XML data/document as parsed by XML parser.
class WXXMLDLLEXPORT wxXmlDocument : public wxObject class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject
{ {
public: public:
wxXmlDocument(); wxXmlDocument();

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

@ -36,9 +36,9 @@ class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
class WXXMLDLLEXPORT wxXmlResourceHandler; class WXDLLIMPEXP_XRC wxXmlResourceHandler;
class WXXMLDLLEXPORT wxXmlSubclassFactory; class WXDLLIMPEXP_XRC wxXmlSubclassFactory;
class WXXMLDLLEXPORT wxXmlSubclassFactoriesList; class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList;
class wxXmlResourceModule; class wxXmlResourceModule;
@ -46,14 +46,14 @@ class wxXmlResourceModule;
// encoded in root node of XRC file as "version" property). // encoded in root node of XRC file as "version" property).
// //
// Rules for increasing version number: // Rules for increasing version number:
// - change it only if you made incompatible change to the format. Addition of new // - change it only if you made incompatible change to the format. Addition
// attribute to control handler is _not_ incompatible change, because older // of new attribute to control handler is _not_ incompatible change, because
// versions of the library may ignore it. // older versions of the library may ignore it.
// - if you change version number, follow these steps: // - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of // - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h) // the wxWindows library (see wx/version.h)
// - reset revision to 0 unless the first three are same as before, in which // - reset revision to 0 unless the first three are same as before,
// case you should increase revision by one // in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MAJOR 2
#define WX_XMLRES_CURRENT_VERSION_MINOR 3 #define WX_XMLRES_CURRENT_VERSION_MINOR 3
#define WX_XMLRES_CURRENT_VERSION_RELEASE 0 #define WX_XMLRES_CURRENT_VERSION_RELEASE 0
@ -66,7 +66,7 @@ class wxXmlResourceModule;
WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \ WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
WX_XMLRES_CURRENT_VERSION_REVISION) WX_XMLRES_CURRENT_VERSION_REVISION)
class WXXMLDLLEXPORT wxXmlResourceDataRecord class WXDLLIMPEXP_XRC wxXmlResourceDataRecord
{ {
public: public:
wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@ -78,11 +78,9 @@ public:
}; };
#ifdef WXXMLISDLL WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); wxXmlResourceDataRecords,
#else WXDLLIMPEXP_XRC);
WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
#endif
enum wxXmlResourceFlags enum wxXmlResourceFlags
{ {
@ -93,7 +91,7 @@ enum wxXmlResourceFlags
// This class holds XML resources from one or more .xml files // This class holds XML resources from one or more .xml files
// (or derived forms, either binary or zipped -- see manual for // (or derived forms, either binary or zipped -- see manual for
// details). // details).
class WXXMLDLLEXPORT wxXmlResource : public wxObject class WXDLLIMPEXP_XRC wxXmlResource : public wxObject
{ {
public: public:
// Constructor. // Constructor.
@ -125,10 +123,10 @@ public:
void InitAllHandlers(); void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says // Initialize only a specific handler (or custom handler). Convention says
// that handler name is equal to the control's name plus 'XmlHandler', for example // that handler name is equal to the control's name plus 'XmlHandler', for
// wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource
// (xmlres) can create include file that contains initialization code for // compiler (xmlres) can create include file that contains initialization
// all controls used within the resource. // code for all controls used within the resource.
void AddHandler(wxXmlResourceHandler *handler); void AddHandler(wxXmlResourceHandler *handler);
// Add a new handler at the begining of the handler list // Add a new handler at the begining of the handler list
@ -300,7 +298,7 @@ private:
// wxXmlResourceHandler is an abstract base class for resource handlers // wxXmlResourceHandler is an abstract base class for resource handlers
// capable of creating a control from an XML node. // capable of creating a control from an XML node.
class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject
{ {
DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler) DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler)
public: public:
@ -460,10 +458,11 @@ void wxXmlInitResourceModule();
// register your subclasses via wxWindows' RTTI mechanism. This class is useful // register your subclasses via wxWindows' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing // only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython). // in wxWindows ports that don't support wxRTTI (e.g. wxPython).
class WXXMLDLLEXPORT wxXmlSubclassFactory class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{ {
public: public:
// Try to create instance of given class and return it, return NULL on failure: // Try to create instance of given class and return it, return NULL on
// failure:
virtual wxObject *Create(const wxString& className) = 0; virtual wxObject *Create(const wxString& className) = 0;
virtual ~wxXmlSubclassFactory() {} virtual ~wxXmlSubclassFactory() {}
}; };