check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 9c3ef03c933d823361d69f71e1826d69dfd2600b..8680717340d0c00a9deae7352d7136ef604523e1 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 #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
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl


@@ -52,8 +52,8 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

-    virtual wxBorder GetDefaultBorder() const;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)