applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index 755e1d2f059f9c7f1d3e975d0b4fb8c821679a9e..25c390aa8fdd2041866a58b50ea82f8b24f20486 100644 (file)
--- a/src/mac/carbon/tglbtn.cpp
+++ b/src/mac/carbon/tglbtn.cpp
@@ -56,25 +56,19 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
                             const wxValidator& validator,
                             const wxString& name)
 {

+    m_macIsUserPane = FALSE ;
+    

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;

-
-    Rect bounds ;
-    Str255 title ;
-
-    if ( UMAHasAquaLayout() )
-    {
-        m_macHorizontalBorder = kMacOSXHorizontalBorder;
-        m_macVerticalBorder = kMacOSXVerticalBorder;
-    }

     
     

-    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    m_label = label ;

 
 

-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , kControlBehaviorToggles , 1, 
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , kControlBehaviorToggles , 1, 

           kControlBevelButtonNormalBevelProc  , (long) this ) ;
           kControlBevelButtonNormalBevelProc  , (long) this ) ;

-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;

     
     

-    MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;

     
   return TRUE;
 }
     
   return TRUE;
 }


@@ -84,26 +78,21 @@ wxSize wxToggleButton::DoGetBestSize() const
     int wBtn = 70 ; 
     int hBtn = 20 ;
 
     int wBtn = 70 ; 
     int hBtn = 20 ;
 

-    int lBtn = m_label.Length() * 10 + 12 ;
+    int lBtn = m_label.Length() * 8 + 12 ;

     if (lBtn > wBtn) 
         wBtn = lBtn;
 
     if (lBtn > wBtn) 
         wBtn = lBtn;
 

-    if ( UMAHasAquaLayout() )
-    {
-        wBtn += 2 * kMacOSXHorizontalBorder ;
-        hBtn += 2 * kMacOSXVerticalBorder ;
-    }

     return wxSize ( wBtn , hBtn ) ;
 }
 
 void wxToggleButton::SetValue(bool val)
 {
     return wxSize ( wBtn , hBtn ) ;
 }
 
 void wxToggleButton::SetValue(bool val)
 {

-    ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ;
+    ::SetControl32BitValue( (ControlRef) m_macControl , val ) ;

 }
 
 bool wxToggleButton::GetValue() const
 {
 }
 
 bool wxToggleButton::GetValue() const
 {

-    return GetControl32BitValue( (ControlHandle) m_macControl ) ;
+    return GetControl32BitValue( (ControlRef) m_macControl ) ;

 }
 
 void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 void wxToggleButton::Command(wxCommandEvent & event)