Updated depricated stuff

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index b469c40ef48241b7e69d86d69524d09729236aae..ae57f23ab07e48b09f2b08a4ec810d27902d15a5 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -214,6 +214,9 @@ void wxControl::SetLabel(const wxString& title)
 
 wxSize wxControl::DoGetBestSize() const
 {
 
 wxSize wxControl::DoGetBestSize() const
 {

+    if ( (ControlHandle) m_macControl == NULL )
+        return wxWindow::DoGetBestSize() ;
+        

     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;


@@ -235,18 +238,7 @@ wxSize wxControl::DoGetBestSize() const
         }
     }
 
         }
     }
 

-    if ( IsKindOf( CLASSINFO( wxButton ) ) )
-    {
-        bestWidth = m_label.Length() * 8 + 12 ;
-        if ( bestWidth < 70 )
-          bestWidth = 70 ;
-    }
-    else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
-    {
-        bestWidth = m_label.Length() * 8 ;
-    }
-    else
-        bestWidth = bestsize.right - bestsize.left ;
+    bestWidth = bestsize.right - bestsize.left ;

         
     bestWidth += 2 * m_macHorizontalBorder ;
 
         
     bestWidth += 2 * m_macHorizontalBorder ;
 


@@ -441,7 +433,7 @@ void wxControl::MacAdjustControlRect()
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {

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

                 if ( m_width < 70 )
                   m_width = 70 ;
             }
                 if ( m_width < 70 )
                   m_width = 70 ;
             }


@@ -462,8 +454,7 @@ void wxControl::MacAdjustControlRect()
 
             m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
         }
 
             m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
         }

-          MacUpdateDimensions() ;      
-//        UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
+         MacUpdateDimensions() ;      

     }
 }
 
     }
 }