Tinderbox build fix (wxCococa).

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

diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 9252d60f916b7599ca2074d18b10efa0564fd614..37a01cecc76e0818d281259d047d810915a2d93d 100644 (file)
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_gdctl.h"
 #endif
 
 #pragma implementation "xh_gdctl.h"
 #endif
 


@@ -19,27 +19,28 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-#if wxUSE_DIRDLG
+#if wxUSE_XRC && wxUSE_DIRDLG

 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/dirctrl.h"
 
 
 #include "wx/textctrl.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")),


@@ -59,4 +60,4 @@ bool wxGenericDirCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGenericDirCtrl"));
 }
 
     return IsOfClass(node, wxT("wxGenericDirCtrl"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_DIRDLG