DC reorganization

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

diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index db98289a1d439b0c827ee085a4ce9e1a3964fcdc..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$
 // 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
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#pragma implementation "button.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/tglbtn.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_TOGGLEBTN
 
 
 #if wxUSE_TOGGLEBTN
 

+#include "wx/tglbtn.h"

 #include "wx/mac/uma.h"
 // Button
 
 #include "wx/mac/uma.h"
 // Button
 

-static const int kMacOSXHorizontalBorder = 2 ;
-static const int kMacOSXVerticalBorder = 4 ;
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -61,11 +54,11 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     
     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 ) ;
     
 
     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->GetControlRefAddr() ) );
     
     verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
         kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );