From 546b00063e1e5dfe104bd90d56874255038758f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 18 Jan 2002 23:16:16 +0000 Subject: [PATCH] slight corrections, moved bwd compat macros to the end of the file git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/xrc/xmlres.h | 17 +++++++++++------ include/wx/xrc/xmlres.h | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h index 8566b230f7..fb076250eb 100644 --- a/contrib/include/wx/xrc/xmlres.h +++ b/contrib/include/wx/xrc/xmlres.h @@ -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, // e.g. ...) to integer id that is needed by // wxWindows event tables. @@ -235,7 +232,7 @@ private: // controls. // Example: // wxDialog dlg; -// wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); +// wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog"); // XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value")); #ifdef __WXDEBUG__ @@ -274,7 +271,6 @@ public: protected: - wxXmlResource *m_resource; wxArrayString m_styleNames; wxArrayInt m_styleValues; @@ -371,7 +367,6 @@ protected: // Programmer-friendly macros for writing XRC handlers: #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) \ classname *variable = NULL; \ @@ -384,4 +379,14 @@ protected: // FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!! 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_ diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 8566b230f7..fb076250eb 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -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, // e.g. ...) to integer id that is needed by // wxWindows event tables. @@ -235,7 +232,7 @@ private: // controls. // Example: // wxDialog dlg; -// wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog"); +// wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog"); // XMLCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value")); #ifdef __WXDEBUG__ @@ -274,7 +271,6 @@ public: protected: - wxXmlResource *m_resource; wxArrayString m_styleNames; wxArrayInt m_styleValues; @@ -371,7 +367,6 @@ protected: // Programmer-friendly macros for writing XRC handlers: #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) \ classname *variable = NULL; \ @@ -384,4 +379,14 @@ protected: // FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!! 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_ -- 2.47.2