Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h
index 6a31109fcb2bbdea63fe067f4df85a0a78cb8a04..d4e6a49957dd93fe1360fefcc7325dff691c4528 100644 (file)
--- a/include/wx/xrc/xh_hyperlink.h
+++ b/include/wx/xrc/xh_hyperlink.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_hyperlink.h
+// Name:        wx/xrc/xh_hyperlink.h
 // Purpose:     Hyperlink control (wxAdv)
 // Author:      David Norris <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi
@@ -12,19 +12,15 @@
 #ifndef _WX_XH_HYPERLINKH__
 #define _WX_XH_HYPERLINKH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "hyperlink.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_HYPERLINKCTRL
-
-#include "wx/hyperlink.h"
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_HYPERLINKCTRL
+
 class WXDLLIMPEXP_XRC wxHyperlinkCtrlXmlHandler : public wxXmlResourceHandler
 {
+    // Register with wxWindows' dynamic class subsystem.
+    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
+
 public:
     // Constructor.
     wxHyperlinkCtrlXmlHandler();
@@ -34,11 +30,8 @@ public:
 
     // Returns true if we know how to create a control for the given node.
     virtual bool CanHandle(wxXmlNode *node);
-
-    // Register with wxWindows' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
 };
 
-#endif // wxUSE_HYPERLINKCTRL
-#endif // _WX_XH_HYPERLINKH__
+#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL
 
+#endif // _WX_XH_HYPERLINKH__