don't eat activation events (replaces patch 1465849)

[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 5ab29aa84c7dac79d20888323c0524ad5eb180f6..7031d4a6a9aaa800c3f7ae9e3262591bed08f4f0 100644 (file)
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -7,13 +7,13 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Csomor
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Csomor

-// License:     wxWindows License
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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


@@ -44,7 +44,7 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

 
     virtual void Command(wxCommandEvent& event);
 
 
     virtual void Command(wxCommandEvent& event);