Warning fixes, source cleaning.

[wxWidgets.git] / contrib / src / xrc / xh_gdctl.cpp

diff --git a/contrib/src/xrc/xh_gdctl.cpp b/contrib/src/xrc/xh_gdctl.cpp
index 9252d60f916b7599ca2074d18b10efa0564fd614..5a8226ebb7c640170c9bc83dabfcb4651fed3ede 100644 (file)
--- a/contrib/src/xrc/xh_gdctl.cpp
+++ b/contrib/src/xrc/xh_gdctl.cpp
@@ -26,20 +26,22 @@
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/dirctrl.h"
 
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/dirctrl.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)
+

 wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
 : wxXmlResourceHandler()
 {
 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();
 }
 
 wxObject *wxGenericDirCtrlXmlHandler::DoCreateResource()
 {
     XRC_MAKE_INSTANCE(ctrl, wxGenericDirCtrl)
     AddWindowStyles();
 }
 
 wxObject *wxGenericDirCtrlXmlHandler::DoCreateResource()
 {
     XRC_MAKE_INSTANCE(ctrl, wxGenericDirCtrl)

- 
+

     ctrl->Create(m_parentAsWindow,
                  GetID(),
                  GetText(wxT("defaultfolder")),
     ctrl->Create(m_parentAsWindow,
                  GetID(),
                  GetText(wxT("defaultfolder")),