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

slight corrections, moved bwd compat macros to the end of the file

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-18 23:16:16 +00:00
parent e37db69998
commit 546b00063e
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,9 +212,6 @@ private:
}; };
// This is here only for backward compatibility. Do NOT use!!
#define wxTheXmlResource wxXmlResource::Get()
// This macro translates string identifier (as used in XML resource, // This macro translates string identifier (as used in XML resource,
// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
// wxWindows event tables. // wxWindows event tables.
@@ -235,7 +232,7 @@ private:
// controls. // controls.
// Example: // Example:
// wxDialog dlg; // wxDialog dlg;
// wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); // wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog");
// XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value")); // XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value"));
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@@ -274,7 +271,6 @@ public:
protected: protected:
wxXmlResource *m_resource; wxXmlResource *m_resource;
wxArrayString m_styleNames; wxArrayString m_styleNames;
wxArrayInt m_styleValues; wxArrayInt m_styleValues;
@@ -371,7 +367,6 @@ protected:
// Programmer-friendly macros for writing XRC handlers: // Programmer-friendly macros for writing XRC handlers:
#define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style) #define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
#define ADD_STYLE XRC_ADD_STYLE /* deprecated, don't use!! */
#define XRC_MAKE_INSTANCE(variable, classname) \ #define XRC_MAKE_INSTANCE(variable, classname) \
classname *variable = NULL; \ classname *variable = NULL; \
@@ -384,4 +379,14 @@ protected:
// FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!! // FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!!
void wxXmlInitResourceModule(); void wxXmlInitResourceModule();
/* -------------------------------------------------------------------------
Backward compatibility macros. Do *NOT* use, they may disappear in future
versions of the XRC library!
------------------------------------------------------------------------- */
#define ADD_STYLE XRC_ADD_STYLE
#define wxTheXmlResource wxXmlResource::Get()
#endif // _WX_XMLRES_H_ #endif // _WX_XMLRES_H_

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

@@ -212,9 +212,6 @@ private:
}; };
// This is here only for backward compatibility. Do NOT use!!
#define wxTheXmlResource wxXmlResource::Get()
// This macro translates string identifier (as used in XML resource, // This macro translates string identifier (as used in XML resource,
// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
// wxWindows event tables. // wxWindows event tables.
@@ -235,7 +232,7 @@ private:
// controls. // controls.
// Example: // Example:
// wxDialog dlg; // wxDialog dlg;
// wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); // wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog");
// XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value")); // XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value"));
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@@ -274,7 +271,6 @@ public:
protected: protected:
wxXmlResource *m_resource; wxXmlResource *m_resource;
wxArrayString m_styleNames; wxArrayString m_styleNames;
wxArrayInt m_styleValues; wxArrayInt m_styleValues;
@@ -371,7 +367,6 @@ protected:
// Programmer-friendly macros for writing XRC handlers: // Programmer-friendly macros for writing XRC handlers:
#define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style) #define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
#define ADD_STYLE XRC_ADD_STYLE /* deprecated, don't use!! */
#define XRC_MAKE_INSTANCE(variable, classname) \ #define XRC_MAKE_INSTANCE(variable, classname) \
classname *variable = NULL; \ classname *variable = NULL; \
@@ -384,4 +379,14 @@ protected:
// FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!! // FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!!
void wxXmlInitResourceModule(); void wxXmlInitResourceModule();
/* -------------------------------------------------------------------------
Backward compatibility macros. Do *NOT* use, they may disappear in future
versions of the XRC library!
------------------------------------------------------------------------- */
#define ADD_STYLE XRC_ADD_STYLE
#define wxTheXmlResource wxXmlResource::Get()
#endif // _WX_XMLRES_H_ #endif // _WX_XMLRES_H_