moving common code

[wxWidgets.git] / include / wx / msw / tglbtn.h

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 9c3ef03c933d823361d69f71e1826d69dfd2600b..a042b9e83b98babb610c45146259b34a3daf172e 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -13,10 +13,10 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxToggleButton : public wxControl
+class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase
 {
 public:
     wxToggleButton() {}
@@ -52,8 +52,8 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
-    virtual wxBorder GetDefaultBorder() const;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)