activating ustring again

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

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index a6dc79548637a82bfad6ee25ad87cd20198af8f2..7519f17537b0e4df8ec7b88aa41bfa0aaf10790b 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_
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

-extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];

 
 // Checkbox item (single checkbox)
 
 // Checkbox item (single checkbox)

-class WXDLLEXPORT wxToggleButton : public wxControl
+class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase

 {
 public:
     wxToggleButton() {}
 {
 public:
     wxToggleButton() {}


@@ -48,9 +48,12 @@ public:
     virtual void Command(wxCommandEvent& event);
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 
     virtual void Command(wxCommandEvent& event);
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 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)