Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / xrc / xh_gdctl.h

diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h
index 548ecaf6168ba6a01bc5a96d9f7317aaf2c55dbe..a62e13858b8c78aab1050876a7fc7770480f6cea 100644 (file)
--- a/include/wx/xrc/xh_gdctl.h
+++ b/include/wx/xrc/xh_gdctl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_gdctl.h
+// Name:        wx/xrc/xh_gdctl.h

 // Purpose:     XML resource handler for wxGenericDirCtrl
 // Author:      Markus Greither
 // Created:     2002/01/20
 // Purpose:     XML resource handler for wxGenericDirCtrl
 // Author:      Markus Greither
 // Created:     2002/01/20


@@ -11,22 +11,20 @@
 #ifndef _WX_XH_GDCTL_H_
 #define _WX_XH_GDCTL_H_
 
 #ifndef _WX_XH_GDCTL_H_
 #define _WX_XH_GDCTL_H_
 

-#ifdef __GNUG__
-#pragma interface "xh_gdctl.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_DIRDLG
+#if wxUSE_XRC && wxUSE_DIRDLG

 
 

-class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler

 {
 {

+    DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
+

 public:
     wxGenericDirCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
 public:
     wxGenericDirCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 

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

 
 #endif // _WX_XH_GDCTL_H_
 
 #endif // _WX_XH_GDCTL_H_