wxChar -> char

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

diff --git a/include/wx/mac/carbon/checkbox.h b/include/wx/mac/carbon/checkbox.h
index 7dcfeb8f9b1c18d2da07080f22521ea54ef84d5d..e1447e355b2d5d7eb7aecdd0255e66d4f41e2b4a 100644 (file)
--- a/include/wx/mac/carbon/checkbox.h
+++ b/include/wx/mac/carbon/checkbox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "checkbox.h"
-#endif
-

 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {


@@ -38,16 +34,17 @@ public:
     virtual void SetValue(bool);
     virtual bool GetValue() const;
 
     virtual void SetValue(bool);
     virtual bool GetValue() const;
 

-    void DoSet3StateValue(wxCheckBoxState val);
-    virtual wxCheckBoxState DoGet3StateValue() const;
-

     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
     virtual void Command(wxCommandEvent& event);
 
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
     virtual void Command(wxCommandEvent& event);
 

+protected:
+    void DoSet3StateValue(wxCheckBoxState val);
+    virtual wxCheckBoxState DoGet3StateValue() const;
+

     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
 public:
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
 public: