don't use deprecated macros

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_gdctl.cpp b/contrib/src/xrc/xh_gdctl.cpp
index 9252d60f916b7599ca2074d18b10efa0564fd614..afd71480e91adfd28b3cbe7a3a5b076d8c1b3975 100644 (file)
--- a/contrib/src/xrc/xh_gdctl.cpp
+++ b/contrib/src/xrc/xh_gdctl.cpp
@@ -29,10 +29,10 @@
 wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
 : wxXmlResourceHandler()
 {
-    ADD_STYLE(wxDIRCTRL_DIR_ONLY);
-    ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
-    ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
-    ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
+    XRC_ADD_STYLE(wxDIRCTRL_DIR_ONLY);
+    XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
+    XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
+    XRC_ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
     AddWindowStyles();
 }
 

diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 9252d60f916b7599ca2074d18b10efa0564fd614..afd71480e91adfd28b3cbe7a3a5b076d8c1b3975 100644 (file)
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -29,10 +29,10 @@
 wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
 : wxXmlResourceHandler()
 {
-    ADD_STYLE(wxDIRCTRL_DIR_ONLY);
-    ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
-    ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
-    ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
+    XRC_ADD_STYLE(wxDIRCTRL_DIR_ONLY);
+    XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
+    XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
+    XRC_ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
     AddWindowStyles();
 }