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

Changed WXDLLEXPORT's to WXXMLDLLEXPORT so the xmlres library can be

Browse Source 
used from wx DLL without it being a DLL also.  Some work will still
need to be done for making xmlres be a DLL...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-06-05 22:03:02 +00:00
parent a763ac036b
commit ea89ec1760
34 changed files with 102 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxBitmapButtonXmlHandler(); wxBitmapButtonXmlHandler();

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxButtonXmlHandler(); wxButtonXmlHandler();

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxCalendarCtrlXmlHandler(); wxCalendarCtrlXmlHandler();

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

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

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxCheckListXmlHandler(); wxCheckListXmlHandler();

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxChoiceXmlHandler(); wxChoiceXmlHandler();

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

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

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxDialogXmlHandler(); wxDialogXmlHandler();

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxFrameXmlHandler(); wxFrameXmlHandler();

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

@@ -22,7 +22,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler
{ {
enum enum
{ {

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

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

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

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

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxListCtrlXmlHandler(); wxListCtrlXmlHandler();

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

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

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

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

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxPanelXmlHandler(); wxPanelXmlHandler();

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

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

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

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

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

@@ -20,7 +20,7 @@
class WXDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler
{ {
enum enum
{ {

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

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

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

@@ -20,7 +20,7 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
class WXDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler
{ {
enum enum
{ {

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

@@ -19,7 +19,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
class WXDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler
{ {
enum enum
{ {
@@ -36,7 +36,7 @@ public:
#endif #endif
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
class WXDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{ {
enum enum
{ {

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxStaticBitmapXmlHandler(); wxStaticBitmapXmlHandler();

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxStaticBoxXmlHandler(); wxStaticBoxXmlHandler();

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

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

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxStaticTextXmlHandler(); wxStaticTextXmlHandler();

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxTextCtrlXmlHandler(); wxTextCtrlXmlHandler();

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

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

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

@@ -17,7 +17,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxTreeCtrlXmlHandler(); wxTreeCtrlXmlHandler();

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

@@ -18,7 +18,7 @@
#include "wx/xml/xmlres.h" #include "wx/xml/xmlres.h"
class WXDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
{ {
public: public:
wxUnknownWidgetXmlHandler(); wxUnknownWidgetXmlHandler();

23
contrib/include/wx/xml/xml.h
View File

@@ -20,11 +20,16 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"
#ifdef WXXMLISDLL
#define WXXMLDLLEXPORT WXDLLEXPORT
#else
#define WXXMLDLLEXPORT
#endif
class WXDLLEXPORT wxXmlNode; class WXXMLDLLEXPORT wxXmlNode;
class WXDLLEXPORT wxXmlProperty; class WXXMLDLLEXPORT wxXmlProperty;
class WXDLLEXPORT wxXmlDocument; class WXXMLDLLEXPORT wxXmlDocument;
class WXDLLEXPORT wxXmlIOHandler; class WXXMLDLLEXPORT wxXmlIOHandler;
class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxInputStream;
class WXDLLEXPORT wxOutputStream; class WXDLLEXPORT wxOutputStream;
@@ -65,7 +70,7 @@ enum wxXmlIOType
// 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 WXDLLEXPORT wxXmlProperty class WXXMLDLLEXPORT wxXmlProperty
{ {
public: public:
wxXmlProperty() : m_next(NULL) {} wxXmlProperty() : m_next(NULL) {}
@@ -103,7 +108,7 @@ private:
// wxCSConv myConv("iso8859-2"); // wxCSConv myConv("iso8859-2");
// wxString s(cMB2WC(node->GetContent().c_str()), myConv); // wxString s(cMB2WC(node->GetContent().c_str()), myConv);
class WXDLLEXPORT wxXmlNode class WXXMLDLLEXPORT wxXmlNode
{ {
public: public:
wxXmlNode() : m_properties(NULL), m_parent(NULL), wxXmlNode() : m_properties(NULL), m_parent(NULL),
@@ -175,7 +180,7 @@ private:
// internal representation is independant on libxml and you can use // internal representation is independant on libxml and you can use
// it without libxml (see Load/SaveBinary). // it without libxml (see Load/SaveBinary).
class WXDLLEXPORT wxXmlDocument : public wxObject class WXXMLDLLEXPORT wxXmlDocument : public wxObject
{ {
public: public:
wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL) {} wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL) {}
@@ -239,7 +244,7 @@ private:
// wxXmlIOHandler takes care of loading and/or saving XML data. // wxXmlIOHandler takes care of loading and/or saving XML data.
// see xmlio.h for available handlers // see xmlio.h for available handlers
class WXDLLEXPORT wxXmlIOHandler : public wxObject class WXXMLDLLEXPORT wxXmlIOHandler : public wxObject
{ {
public: public:
wxXmlIOHandler() {} wxXmlIOHandler() {}
@@ -254,6 +259,6 @@ class WXDLLEXPORT wxXmlIOHandler : public wxObject
void wxXmlInitXmlModule();
#endif // _WX_XML_H_ #endif // _WX_XML_H_

8
contrib/include/wx/xml/xmlio.h
View File

@@ -20,7 +20,7 @@
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
class WXDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler class WXXMLDLLEXPORT wxXmlIOHandlerExpat : public wxXmlIOHandler
{ {
public: public:
virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; } virtual wxXmlIOType GetType() { return wxXML_IO_EXPAT; }
@@ -32,7 +32,7 @@ public:
}; };
class WXDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler class WXXMLDLLEXPORT wxXmlIOHandlerWriter : public wxXmlIOHandler
{ {
public: public:
virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; } virtual wxXmlIOType GetType() { return wxXML_IO_TEXT_OUTPUT; }
@@ -44,7 +44,7 @@ public:
}; };
class WXDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler class WXXMLDLLEXPORT wxXmlIOHandlerBin : public wxXmlIOHandler
{ {
public: public:
wxXmlIOHandlerBin() {} wxXmlIOHandlerBin() {}
@@ -65,7 +65,7 @@ protected:
#if wxUSE_ZLIB #if wxUSE_ZLIB
class WXDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin class WXXMLDLLEXPORT wxXmlIOHandlerBinZ : public wxXmlIOHandlerBin
{ {
public: public:
wxXmlIOHandlerBinZ() {} wxXmlIOHandlerBinZ() {}

18
contrib/include/wx/xml/xmlres.h
View File

@@ -25,6 +25,8 @@
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/xml/xml.h"
class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxDialog; class WXDLLEXPORT wxDialog;
@@ -33,9 +35,8 @@ class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
class WXDLLEXPORT wxXmlResourceHandler; class WXXMLDLLEXPORT wxXmlResourceHandler;
#include "wx/xml/xml.h"
// These macros indicate current version of XML resources (this information is // These macros indicate current version of XML resources (this information is
// encoded in root node of XRC file as "version" property). // encoded in root node of XRC file as "version" property).
@@ -61,7 +62,7 @@ class WXDLLEXPORT wxXmlResourceHandler;
WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \ WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
WX_XMLRES_CURRENT_VERSION_REVISION) WX_XMLRES_CURRENT_VERSION_REVISION)
class WXDLLEXPORT wxXmlResourceDataRecord class WXXMLDLLEXPORT wxXmlResourceDataRecord
{ {
public: public:
wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {}
@@ -72,13 +73,19 @@ public:
wxDateTime Time; wxDateTime Time;
}; };
#ifdef WXXMLISDLL
WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
#else
WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords);
#endif
// 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 WXDLLEXPORT wxXmlResource : public wxObject class WXXMLDLLEXPORT wxXmlResource : public wxObject
{ {
public: public:
// Ctor. If use_locale is TRUE, translatable strings are // Ctor. If use_locale is TRUE, translatable strings are
@@ -225,7 +232,7 @@ extern wxXmlResource *wxTheXmlResource;
#endif #endif
class WXDLLEXPORT wxXmlResourceHandler : public wxObject class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject
{ {
public: public:
wxXmlResourceHandler(); wxXmlResourceHandler();
@@ -346,5 +353,6 @@ protected:
#define ADD_STYLE(style) AddStyle(wxT(#style), style) #define ADD_STYLE(style) AddStyle(wxT(#style), style)
void wxXmlInitResourceModule();
#endif // _WX_XMLRES_H_ #endif // _WX_XMLRES_H_