</headers>
<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/xmltok</include>
<sources>$(XRC_SRC)</sources>
- <wx-lib>core</wx-lib>
<wx-lib>html</wx-lib>
+ <wx-lib>core</wx-lib>
+ <wx-lib>base</wx-lib>
</dll>
<lib id="xrclib" template="wx_contrib_lib" cond="SHARED=='0'">
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
public:
virtual bool CanHandle(wxXmlNode *node);
};
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
public:
#if wxUSE_CHECKBOX
-class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
public:
#if wxUSE_COMBOBOX
-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
enum
#if wxUSE_DIRDLG
-class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
public:
#if wxUSE_HTML
-class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
public:
#if wxUSE_LISTBOX
-class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
public:
bool m_insideMenu;
};
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
public:
class WXDLLEXPORT wxNotebook;
-class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
public:
#if wxUSE_RADIOBOX
-class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
public:
#if wxUSE_RADIOBOX
-class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
public:
-class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
enum
-class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
public:
class WXDLLEXPORT wxSizer;
-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
public:
#if wxUSE_SLIDER
-class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
enum
#include "wx/defs.h"
#if wxUSE_SPINBTN
-class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
enum
#endif
#if wxUSE_SPINCTRL
-class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
enum
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
public:
#if wxUSE_STATLINE
-class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
public:
class WXDLLEXPORT wxToolBar;
-class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
public:
#include "wx/wizard.h"
-class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
public:
#include "wx/object.h"
#include "wx/list.h"
-#ifdef WXXMLISDLL
-#define WXXMLDLLEXPORT WXDLLEXPORT
-#else
-#define WXXMLDLLEXPORT
+#ifdef WXMAKINGDLL_XRC
+ #define WXDLLIMPEXP_XRC WXEXPORT
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_XRC WXIMPORT
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_XRC
#endif
-class WXXMLDLLEXPORT wxXmlNode;
-class WXXMLDLLEXPORT wxXmlProperty;
-class WXXMLDLLEXPORT wxXmlDocument;
-class WXXMLDLLEXPORT wxXmlIOHandler;
+class WXDLLIMPEXP_XRC wxXmlNode;
+class WXDLLIMPEXP_XRC wxXmlProperty;
+class WXDLLIMPEXP_XRC wxXmlDocument;
+class WXDLLIMPEXP_XRC wxXmlIOHandler;
class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream;
// Example: in <img src="hello.gif" id="3"/> "src" is property with value
// "hello.gif" and "id" is prop. with value "3".
-class WXXMLDLLEXPORT wxXmlProperty
+class WXDLLIMPEXP_XRC wxXmlProperty
{
public:
wxXmlProperty() : m_next(NULL) {}
// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
// (default is UTF-8).
-class WXXMLDLLEXPORT wxXmlNode
+class WXDLLIMPEXP_XRC wxXmlNode
{
public:
wxXmlNode() : m_properties(NULL), m_parent(NULL),
// This class holds XML data/document as parsed by XML parser.
-class WXXMLDLLEXPORT wxXmlDocument : public wxObject
+class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject
{
public:
wxXmlDocument();
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar;
-class WXXMLDLLEXPORT wxXmlResourceHandler;
-class WXXMLDLLEXPORT wxXmlSubclassFactory;
-class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
+class WXDLLIMPEXP_XRC wxXmlResourceHandler;
+class WXDLLIMPEXP_XRC wxXmlSubclassFactory;
+class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList;
class wxXmlResourceModule;
// encoded in root node of XRC file as "version" property).
//
// Rules for increasing version number:
-// - change it only if you made incompatible change to the format. Addition of new
-// attribute to control handler is _not_ incompatible change, because older
-// versions of the library may ignore it.
+// - change it only if you made incompatible change to the format. Addition
+// of new attribute to control handler is _not_ incompatible change, because
+// older versions of the library may ignore it.
// - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h)
-// - reset revision to 0 unless the first three are same as before, in which
-// case you should increase revision by one
+// - reset revision to 0 unless the first three are same as before,
+// in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2
#define WX_XMLRES_CURRENT_VERSION_MINOR 3
#define WX_XMLRES_CURRENT_VERSION_RELEASE 0
WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
WX_XMLRES_CURRENT_VERSION_REVISION)
-class WXXMLDLLEXPORT wxXmlResourceDataRecord
+class WXDLLIMPEXP_XRC wxXmlResourceDataRecord
{
public:
wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
};
-#ifdef WXXMLISDLL
-WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#else
-WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#endif
+WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
+ wxXmlResourceDataRecords,
+ WXDLLIMPEXP_XRC);
enum wxXmlResourceFlags
{
// This class holds XML resources from one or more .xml files
// (or derived forms, either binary or zipped -- see manual for
// details).
-class WXXMLDLLEXPORT wxXmlResource : public wxObject
+class WXDLLIMPEXP_XRC wxXmlResource : public wxObject
{
public:
// Constructor.
void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says
- // that handler name is equal to the control's name plus 'XmlHandler', for example
- // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler
- // (xmlres) can create include file that contains initialization code for
- // all controls used within the resource.
+ // that handler name is equal to the control's name plus 'XmlHandler', for
+ // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource
+ // compiler (xmlres) can create include file that contains initialization
+ // code for all controls used within the resource.
void AddHandler(wxXmlResourceHandler *handler);
// Add a new handler at the begining of the handler list
// wxXmlResourceHandler is an abstract base class for resource handlers
// capable of creating a control from an XML node.
-class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
+class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler)
public:
// register your subclasses via wxWindows' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
-class WXXMLDLLEXPORT wxXmlSubclassFactory
+class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{
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 ~wxXmlSubclassFactory() {}
};
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
public:
virtual bool CanHandle(wxXmlNode *node);
};
-class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
public:
#if wxUSE_CHECKBOX
-class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
public:
#if wxUSE_COMBOBOX
-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
enum
#if wxUSE_DIRDLG
-class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
public:
#if wxUSE_HTML
-class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
public:
#if wxUSE_LISTBOX
-class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
public:
bool m_insideMenu;
};
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
public:
class WXDLLEXPORT wxNotebook;
-class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
public:
#if wxUSE_RADIOBOX
-class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
public:
#if wxUSE_RADIOBOX
-class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
public:
-class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
enum
-class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
public:
class WXDLLEXPORT wxSizer;
-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
public:
#if wxUSE_SLIDER
-class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
enum
#include "wx/defs.h"
#if wxUSE_SPINBTN
-class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
enum
#endif
#if wxUSE_SPINCTRL
-class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
enum
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
public:
#if wxUSE_STATLINE
-class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
public:
class WXDLLEXPORT wxToolBar;
-class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
public:
#include "wx/xrc/xmlres.h"
-class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
public:
#include "wx/wizard.h"
-class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
public:
#include "wx/object.h"
#include "wx/list.h"
-#ifdef WXXMLISDLL
-#define WXXMLDLLEXPORT WXDLLEXPORT
-#else
-#define WXXMLDLLEXPORT
+#ifdef WXMAKINGDLL_XRC
+ #define WXDLLIMPEXP_XRC WXEXPORT
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_XRC WXIMPORT
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_XRC
#endif
-class WXXMLDLLEXPORT wxXmlNode;
-class WXXMLDLLEXPORT wxXmlProperty;
-class WXXMLDLLEXPORT wxXmlDocument;
-class WXXMLDLLEXPORT wxXmlIOHandler;
+class WXDLLIMPEXP_XRC wxXmlNode;
+class WXDLLIMPEXP_XRC wxXmlProperty;
+class WXDLLIMPEXP_XRC wxXmlDocument;
+class WXDLLIMPEXP_XRC wxXmlIOHandler;
class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream;
// Example: in <img src="hello.gif" id="3"/> "src" is property with value
// "hello.gif" and "id" is prop. with value "3".
-class WXXMLDLLEXPORT wxXmlProperty
+class WXDLLIMPEXP_XRC wxXmlProperty
{
public:
wxXmlProperty() : m_next(NULL) {}
// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
// (default is UTF-8).
-class WXXMLDLLEXPORT wxXmlNode
+class WXDLLIMPEXP_XRC wxXmlNode
{
public:
wxXmlNode() : m_properties(NULL), m_parent(NULL),
// This class holds XML data/document as parsed by XML parser.
-class WXXMLDLLEXPORT wxXmlDocument : public wxObject
+class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject
{
public:
wxXmlDocument();
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar;
-class WXXMLDLLEXPORT wxXmlResourceHandler;
-class WXXMLDLLEXPORT wxXmlSubclassFactory;
-class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
+class WXDLLIMPEXP_XRC wxXmlResourceHandler;
+class WXDLLIMPEXP_XRC wxXmlSubclassFactory;
+class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList;
class wxXmlResourceModule;
// encoded in root node of XRC file as "version" property).
//
// Rules for increasing version number:
-// - change it only if you made incompatible change to the format. Addition of new
-// attribute to control handler is _not_ incompatible change, because older
-// versions of the library may ignore it.
+// - change it only if you made incompatible change to the format. Addition
+// of new attribute to control handler is _not_ incompatible change, because
+// older versions of the library may ignore it.
// - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h)
-// - reset revision to 0 unless the first three are same as before, in which
-// case you should increase revision by one
+// - reset revision to 0 unless the first three are same as before,
+// in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2
#define WX_XMLRES_CURRENT_VERSION_MINOR 3
#define WX_XMLRES_CURRENT_VERSION_RELEASE 0
WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
WX_XMLRES_CURRENT_VERSION_REVISION)
-class WXXMLDLLEXPORT wxXmlResourceDataRecord
+class WXDLLIMPEXP_XRC wxXmlResourceDataRecord
{
public:
wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
};
-#ifdef WXXMLISDLL
-WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#else
-WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
-#endif
+WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
+ wxXmlResourceDataRecords,
+ WXDLLIMPEXP_XRC);
enum wxXmlResourceFlags
{
// This class holds XML resources from one or more .xml files
// (or derived forms, either binary or zipped -- see manual for
// details).
-class WXXMLDLLEXPORT wxXmlResource : public wxObject
+class WXDLLIMPEXP_XRC wxXmlResource : public wxObject
{
public:
// Constructor.
void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says
- // that handler name is equal to the control's name plus 'XmlHandler', for example
- // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler
- // (xmlres) can create include file that contains initialization code for
- // all controls used within the resource.
+ // that handler name is equal to the control's name plus 'XmlHandler', for
+ // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource
+ // compiler (xmlres) can create include file that contains initialization
+ // code for all controls used within the resource.
void AddHandler(wxXmlResourceHandler *handler);
// Add a new handler at the begining of the handler list
// wxXmlResourceHandler is an abstract base class for resource handlers
// capable of creating a control from an XML node.
-class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
+class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler)
public:
// register your subclasses via wxWindows' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
-class WXXMLDLLEXPORT wxXmlSubclassFactory
+class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{
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 ~wxXmlSubclassFactory() {}
};
projects / wxWidgets.git / commitdiff
