Anim doesn't depend on GIF, remove wxUSE_GIF.

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index ab9d4b10220efc5718047a6a0840e6bf08704bae..55785b73ace804bdf6ab677ee3e3215dc54599fc 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -1,18 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

 /////////////////////////////////////////////////////////////////////////////
 
 #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/mac/uma.h"
 #include "wx/stockitem.h"
 
 #include "wx/mac/uma.h"


@@ -40,6 +45,7 @@ bool wxButton::Create(wxWindow *parent,
 
     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 )


@@ -47,8 +53,10 @@ bool wxButton::Create(wxWindow *parent,
         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)
     {
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {


@@ -71,32 +79,36 @@ bool wxButton::Create(wxWindow *parent,
         }
 #endif
 
         }
 #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() );

     }
 
     }
 

+    verify_noerr( err );

     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
 
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
 

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

 
     return true;
 }
 
 void wxButton::SetDefault()
 {
 
     return true;
 }
 
 void wxButton::SetDefault()
 {

-    wxWindow *parent = GetParent();
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);

     wxButton *btnOldDefault = NULL;
     wxButton *btnOldDefault = NULL;

-
-    if ( parent )
+    if ( tlw )

     {
     {

-        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), wxButton);
-        parent->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+        tlw->SetDefaultItem(this);

     }
 
     if ( btnOldDefault )
     }
 
     if ( btnOldDefault )


@@ -115,17 +127,17 @@ wxSize wxButton::DoGetBestSize() const
 
     switch (GetWindowVariant())
     {
 
     switch (GetWindowVariant())
     {

-       case wxWINDOW_VARIANT_NORMAL:
-       case wxWINDOW_VARIANT_LARGE:
+        case wxWINDOW_VARIANT_NORMAL:
+        case wxWINDOW_VARIANT_LARGE:

             sz.y = 20 ;
             charspace = 10 ;
             break;
 
             sz.y = 20 ;
             charspace = 10 ;
             break;
 

-       case wxWINDOW_VARIANT_SMALL:
+        case wxWINDOW_VARIANT_SMALL:

             sz.y = 17 ;
             break;
 
             sz.y = 17 ;
             break;
 

-       case wxWINDOW_VARIANT_MINI:
+        case wxWINDOW_VARIANT_MINI:

             sz.y = 15 ;
             break;
 
             sz.y = 15 ;
             break;
 


@@ -135,11 +147,11 @@ wxSize wxButton::DoGetBestSize() const
 
     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
     {
     }
     else
     {


@@ -147,7 +159,7 @@ wxSize wxButton::DoGetBestSize() const
         sz.y = bestsize.bottom - bestsize.top ;
     }
 
         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 ;


@@ -155,7 +167,7 @@ wxSize wxButton::DoGetBestSize() const
 
 wxSize wxButton::GetDefaultSize()
 {
 
 wxSize wxButton::GetDefaultSize()
 {

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

     int hBtn = 20 ;
 
     return wxSize(wBtn, hBtn);
     int hBtn = 20 ;
 
     return wxSize(wBtn, hBtn);


@@ -167,12 +179,11 @@ void wxButton::Command (wxCommandEvent & event)
     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);
 
     return noErr;
 }
     event.SetEventObject(this);
     ProcessCommand(event);
 
     return noErr;
 }

-