wxChar -> char

[wxWidgets.git] / include / wx / mac / carbon / tglbtn.h

diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 4524315dbab533f689f4650d5250f77cb832ce17..b27bdeb59ca34406a9283a3456f516b2cd59e45e 100644 (file)
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -13,7 +13,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

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

 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl


@@ -49,6 +49,7 @@ public:
     virtual void Command(wxCommandEvent& event);
 
 protected:
     virtual void Command(wxCommandEvent& event);
 
 protected:

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

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private: