rebaked after timer/socket changes

[wxWidgets.git] / src / mac / carbon / tglbtn.cpp

diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index 909eeb4d79326e8e98d3db485504dd62ad6c1ef5..27bb8c15e6e6aeb764c9ca2a76ff2c3193548efd 100644 (file)
--- a/src/mac/carbon/tglbtn.cpp
+++ b/src/mac/carbon/tglbtn.cpp
@@ -6,8 +6,8 @@
 // Modified by:
 // Created:     08.02.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Johnny C. Norris II
-// License:     Rocketeer license
+// Copyright:   (c) Stefan Csomor
+// License:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -18,21 +18,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#pragma implementation "button.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/tglbtn.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
 #include "wx/mac/uma.h"
 // Button
 
-static const int kMacOSXHorizontalBorder = 2 ;
-static const int kMacOSXVerticalBorder = 4 ;
-
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -61,13 +54,13 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     
-    m_label = label ;
+    m_labelOrig = m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
-        kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , *m_peer ) );
+        kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
     
     
     MacPostControlCreate(pos,size) ;
@@ -89,12 +82,12 @@ wxSize wxToggleButton::DoGetBestSize() const
 
 void wxToggleButton::SetValue(bool val)
 {
-    ::SetControl32BitValue( *m_peer , val ) ;
+    m_peer->SetValue( val ) ;
 }
 
 bool wxToggleButton::GetValue() const
 {
-    return GetControl32BitValue( *m_peer ) ;
+    return m_peer->GetValue() ;
 }
 
 void wxToggleButton::Command(wxCommandEvent & event)