ensure that GetEditControl() returns something even if label editing was started...

[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 a426cb734bb66cf743bee6f84b534890c63f0ff0..981a66b7cccaeb8369f9d82649f9e223e38473a5 100644 (file)
--- a/include/wx/mac/carbon/checkbox.h
+++ b/include/wx/mac/carbon/checkbox.h
@@ -12,12 +12,8 @@
 #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)
 // Checkbox item (single checkbox)

-class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase

 {
 public:
     wxCheckBox() { }
 {
 public:
     wxCheckBox() { }


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

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

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

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown );
-    virtual void Command(wxCommandEvent& event);
-

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

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox

 {
 public:
     int checkWidth;
 {
 public:
     int checkWidth;