Fixed the drawing of the HRules so they don't try to iterate over all

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 72e1af8e5d14504952402d4dc73d6199577f4337..e8a9b079b62e2aef6f56e8e6326d68e208356ce2 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/button.h"
 #include "wx/panel.h"
 
 #include "wx/button.h"
 #include "wx/panel.h"
 


@@ -35,7 +37,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 

                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        


@@ -51,11 +53,12 @@ void wxButton::SetDefault()
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     {
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     {

-        btnOldDefault = panel->GetDefaultItem();
+        btnOldDefault = wxDynamicCast(panel->GetDefaultItem(),
+           wxButton);

         panel->SetDefaultItem(this);
     }
 
         panel->SetDefaultItem(this);
     }
 

-#ifdef __UNIX__
+#ifdef __DARWIN__

        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {


@@ -85,18 +88,20 @@ void wxButton::SetDefault()
 
 wxSize wxButton::DoGetBestSize() const
 {
 
 wxSize wxButton::DoGetBestSize() const
 {

+  wxSize sz = GetDefaultSize() ;
+  

     int wBtn = m_label.Length() * 8 + 12 ;
        int hBtn = 20 ;
        
     int wBtn = m_label.Length() * 8 + 12 ;
        int hBtn = 20 ;
        

-       if ( wBtn < 80 )
-               wBtn = 80 ;
-
-    return wxSize(wBtn, hBtn);
+  if (wBtn > sz.x) sz.x = wBtn;
+  if (hBtn > sz.y) sz.y = hBtn;
+  
+  return sz ;

 }
 
 wxSize wxButton::GetDefaultSize()
 {
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ; 
+    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 

        int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
 
     return wxSize(wBtn, hBtn);
        int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
 
     return wxSize(wBtn, hBtn);