Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h
index 75167d9cc421dfee646cb8bbe3c49964b0fad386..bdd2027a8369c59794f4fbb8f5d2da6140db139c 100644 (file)
--- a/include/wx/xrc/xh_tglbtn.h
+++ b/include/wx/xrc/xh_tglbtn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_tglbtn.h
+// Name:        wx/xrc/xh_tglbtn.h
 // Purpose:     XML resource handler for wxToggleButton
 // Author:      Julian Smart
 // Created:     2004-08-30
@@ -11,26 +11,26 @@
 #ifndef _WX_XH_TGLBTN_H_
 #define _WX_XH_TGLBTN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_tglbtn.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
 
-#if wxUSE_TOGGLEBTN
+#if wxUSE_XRC && wxUSE_TOGGLEBTN
 
 class WXDLLIMPEXP_XRC wxToggleButtonXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+
 public:
     wxToggleButtonXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
-};
 
+protected:
+    virtual void DoCreateToggleButton(wxObject *control);
+#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+    virtual void DoCreateBitmapToggleButton(wxObject *control);
 #endif
+};
 
+#endif // wxUSE_XRC && wxUSE_TOGGLEBTN
 
 #endif // _WX_XH_TGLBTN_H_
-