Patch 1709108

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 66f2cfdeff2e9f46926f0b3f5c0b015be16941c9..fe3f47987009d93558353f0058c5b99d38119720 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -1,46 +1,51 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        src/mac/carbon/button.cpp

 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "button.h"
-#endif
-

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

-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/panel.h"
+    #include "wx/toplevel.h"
+#endif
+

 #include "wx/stockitem.h"
 
 #include "wx/stockitem.h"
 

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

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 

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

 
 

-bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxButton::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxString& lbl,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)

 {
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);
 {
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);

-    
-    m_macIsUserPane = FALSE ;
-    
+
+    m_macIsUserPane = false ;
+

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

-    
+

     m_label = label ;
 
     m_label = label ;
 

+    OSStatus err;

     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_peer = new wxMacControl(this) ;
     if ( id == wxID_HELP )
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_peer = new wxMacControl(this) ;
     if ( id == wxID_HELP )


@@ -48,13 +53,15 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
         ControlButtonContentInfo info ;
         info.contentType = kControlContentIconRef ;
         GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);
         ControlButtonContentInfo info ;
         info.contentType = kControlContentIconRef ;
         GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);

-        verify_noerr ( CreateRoundButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , kControlRoundButtonNormalSize , 
-            &info , m_peer->GetControlRefAddr() ) );
+        err = CreateRoundButtonControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+            &bounds, kControlRoundButtonNormalSize,
+            &info, m_peer->GetControlRefAddr() );

     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
 #if TARGET_API_MAC_OSX
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
 #if TARGET_API_MAC_OSX

-        //Button height is static in Mac, can't be changed, so we need to force it here
+        // Button height is static in Mac, can't be changed, so we need to force it here

         if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
         {
             bounds.bottom = bounds.top + 20 ;
         if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
         {
             bounds.bottom = bounds.top + 20 ;


@@ -71,78 +78,87 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
             m_maxHeight = 15 ;
         }
 #endif
             m_maxHeight = 15 ;
         }
 #endif

-        verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) );
+
+        err = CreatePushButtonControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+            &bounds, CFSTR(""), m_peer->GetControlRefAddr() );

     }
     else
     {
         ControlButtonContentInfo info ;
         info.contentType = kControlNoContent ;
     }
     else
     {
         ControlButtonContentInfo info ;
         info.contentType = kControlNoContent ;

-        verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
-            kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
+        err = CreateBevelButtonControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""),
+            kControlBevelButtonLargeBevel, kControlBehaviorPushbutton,
+            &info, 0, 0, 0, m_peer->GetControlRefAddr() );

     }
     }

-    
-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
-    
-    MacPostControlCreate(pos,size) ;
-    
-  return TRUE;
+
+    verify_noerr( err );
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
+
+    MacPostControlCreate( pos, size );
+
+    return true;

 }
 
 }
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

-    wxWindow *parent = GetParent();
-    wxButton *btnOldDefault = NULL;
-    if ( parent )
+    wxWindow *btnOldDefault = wxButtonBase::SetDefault();
+
+    if ( btnOldDefault )

     {
     {

-        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
-           wxButton);
-        parent->SetDefaultItem(this);
+        // cast needed to access the protected member
+        btnOldDefault->GetPeer()->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;

     }
 
     }
 

-    if ( btnOldDefault )
-        btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;

     m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;
     m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;

+
+    return btnOldDefault;

 }
 
 wxSize wxButton::DoGetBestSize() const
 {
     if ( GetId() == wxID_HELP )
         return wxSize( 20 , 20 ) ;
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
     if ( GetId() == wxID_HELP )
         return wxSize( 20 , 20 ) ;

-        
-    wxSize sz = GetDefaultSize() ;

 
 

+    wxSize sz = GetDefaultSize() ;

     int charspace = 8 ;
     int charspace = 8 ;

-    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
-    {
-        sz.y = 20 ;
-        charspace = 10 ;
-    }
-    else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
-    {
-        sz.y = 17 ;
-        charspace = 8 ;
-    }
-    else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+
+    switch (GetWindowVariant())

     {
     {

-        sz.y = 15 ;
-        charspace = 8 ;
+        case wxWINDOW_VARIANT_NORMAL:
+        case wxWINDOW_VARIANT_LARGE:
+            sz.y = 20 ;
+            charspace = 10 ;
+            break;
+
+        case wxWINDOW_VARIANT_SMALL:
+            sz.y = 17 ;
+            break;
+
+        case wxWINDOW_VARIANT_MINI:
+            sz.y = 15 ;
+            break;
+
+        default:
+            break;

     }
     }

-  
+

     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     m_peer->GetBestRect( &bestsize ) ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     m_peer->GetBestRect( &bestsize ) ;

-  
+

     int wBtn;
     if ( EmptyRect( &bestsize ) )
     {
     int wBtn;
     if ( EmptyRect( &bestsize ) )
     {

-        wBtn = m_label.Length() * charspace + 12 ;
+        wBtn = m_label.length() * charspace + 12 ;

     }
     else
     {
         wBtn = bestsize.right - bestsize.left ;
         sz.y = bestsize.bottom - bestsize.top ;
     }
     }
     else
     {
         wBtn = bestsize.right - bestsize.left ;
         sz.y = bestsize.bottom - bestsize.top ;
     }

-    
-    if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) 
+
+    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))

         sz.x = wBtn;
 
     return sz ;
         sz.x = wBtn;
 
     return sz ;


@@ -150,23 +166,23 @@ wxSize wxButton::DoGetBestSize() const
 
 wxSize wxButton::GetDefaultSize()
 {
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 70 ; 
+    int wBtn = 70 ;

     int hBtn = 20 ;
     int hBtn = 20 ;

-    
+

     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
     m_peer->Flash(kControlButtonPart) ;
     return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
     m_peer->Flash(kControlButtonPart) ;

-    ProcessCommand (event);
+    ProcessCommand(event);

 }
 
 }
 

-wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);

     event.SetEventObject(this);
     ProcessCommand(event);
     event.SetEventObject(this);
     ProcessCommand(event);

-    return noErr ;
-}

 
 

+    return noErr;
+}