Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index 87fa56c82bc0f5bc6f86603b175f066e94fac100..b96099be0d526c9c71c7142b2065ae2356bb8af5 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:


@@ -21,34 +21,24 @@
 
 #include "wx/stockitem.h"
 
 
 #include "wx/stockitem.h"
 

-#include "wx/mac/uma.h"
+#include "wx/osx/private.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+//
+//
+//

 
 

-
-bool wxButton::Create(wxWindow *parent,
-    wxWindowID id,
-    const wxString& lbl,
-    const wxPoint& pos,
-    const wxSize& size,
-    long style,
-    const wxValidator& validator,
-    const wxString& name)
+wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxString& label,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
 {

-    wxString label(lbl);
-    if (label.empty() && wxIsStockID(id))
-        label = wxGetStockLabel(id);
-
-    m_macIsUserPane = false ;
-
-    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    m_labelOrig = m_label = label ;
-

     OSStatus err;
     OSStatus err;

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl(this) ;
+    Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
+    wxMacControl* peer = new wxMacControl(wxpeer) ;

     if ( id == wxID_HELP )
     {
         ControlButtonContentInfo info ;
     if ( id == wxID_HELP )
     {
         ControlButtonContentInfo info ;


@@ -57,29 +47,33 @@ bool wxButton::Create(wxWindow *parent,
         err = CreateRoundButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
             &bounds, kControlRoundButtonNormalSize,
         err = CreateRoundButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
             &bounds, kControlRoundButtonNormalSize,

-            &info, m_peer->GetControlRefAddr() );
+            &info, peer->GetControlRefAddr() );

     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
         // Button height is static in Mac, can't be changed, so we need to force it here
     }
     else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
     {
         // 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 )
+        int maxHeight;
+        switch (wxpeer->GetWindowVariant() )

         {
         {

-            bounds.bottom = bounds.top + 20 ;
-            m_maxHeight = 20 ;
-        }
-        else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
-        {
-            bounds.bottom = bounds.top + 17 ;
-            m_maxHeight = 17 ;
-        }
-        else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
-        {
-            bounds.bottom = bounds.top + 15 ;
-            m_maxHeight = 15 ;
+            default:
+                wxFAIL_MSG( "unknown window variant" );
+                // fall through
+
+            case wxWINDOW_VARIANT_NORMAL:
+            case wxWINDOW_VARIANT_LARGE:
+                maxHeight = 20 ;
+                break;
+            case wxWINDOW_VARIANT_SMALL:
+                maxHeight = 17;
+                break;
+            case wxWINDOW_VARIANT_MINI:
+                maxHeight = 15;

         }
         }

+        bounds.bottom = bounds.top + maxHeight ;
+        wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight ));

         err = CreatePushButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
         err = CreatePushButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),

-            &bounds, CFSTR(""), m_peer->GetControlRefAddr() );
+            &bounds, CFSTR(""), peer->GetControlRefAddr() );

     }
     else
     {
     }
     else
     {


@@ -88,186 +82,40 @@ bool wxButton::Create(wxWindow *parent,
         err = CreateBevelButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""),
             kControlBevelButtonLargeBevel, kControlBehaviorPushbutton,
         err = CreateBevelButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""),
             kControlBevelButtonLargeBevel, kControlBehaviorPushbutton,

-            &info, 0, 0, 0, m_peer->GetControlRefAddr() );
+            &info, 0, 0, 0, peer->GetControlRefAddr() );

     }
     }

-

     verify_noerr( err );
     verify_noerr( err );

-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
-
-    MacPostControlCreate( pos, size );
-
-    return true;
-}
-
-wxWindow *wxButton::SetDefault()
-{
-    wxWindow *btnOldDefault = wxButtonBase::SetDefault();
-
-    if ( btnOldDefault )
-    {
-        // cast needed to access the protected member
-        btnOldDefault->GetPeer()->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
-    }
-
-    m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;
-
-    return btnOldDefault;
-}
-
-wxSize wxButton::DoGetBestSize() const
-{
-    if ( GetId() == wxID_HELP )
-        return wxSize( 20 , 20 ) ;
-
-    wxSize sz = GetDefaultSize() ;
-
-    switch (GetWindowVariant())
-    {
-        case wxWINDOW_VARIANT_NORMAL:
-        case wxWINDOW_VARIANT_LARGE:
-            sz.y = 20 ;
-            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 ) ;
-
-    int wBtn;
-    if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
-    {
-        Point bounds;
-
-        ControlFontStyleRec controlFont;
-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
-        verify_noerr( err );
-
-        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
-
-#if wxMAC_USE_ATSU_TEXT
-        SInt16 baseline;
-        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-        {
-            err = GetThemeTextDimensions(
-                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
-                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
-            verify_noerr( err );
-        }
-        else
-#endif
-        {
-            wxClientDC dc(const_cast<wxButton*>(this));
-            wxCoord width, height ;
-            dc.GetTextExtent( m_label , &width, &height);
-            bounds.h = width;
-            bounds.v = height;
-        }
-
-        wBtn = bounds.h + sz.y;
-    }
-    else
-    {
-        wBtn = bestsize.right - bestsize.left ;
-        // non 'normal' window variants don't return the correct height
-        // sz.y = bestsize.bottom - bestsize.top ;
-    }
-
-    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
-        sz.x = wBtn;
-
-    return sz ;
-}
-
-wxSize wxButton::GetDefaultSize()
-{
-    int wBtn = 70 ;
-    int hBtn = 20 ;
-
-    return wxSize(wBtn, hBtn);
+    return peer;

 }
 
 }
 

-void wxButton::Command (wxCommandEvent & event)
+void wxMacControl::SetDefaultButton( bool isDefault )

 {
 {

-    m_peer->Flash(kControlButtonPart) ;
-    ProcessCommand(event);
+    SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) isDefault ) ;

 }
 
 }
 

-wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),
+                                    const wxString& label,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
-    event.SetEventObject(this);
-    ProcessCommand(event);
-
-    return noErr;
-}
-
-//-------------------------------------------------------
-// wxDisclosureTriangle
-//-------------------------------------------------------
-
-bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-   const wxPoint& pos, const wxSize& size, long style,const wxValidator& validator, const wxString& name )
-{
-    m_macIsUserPane = false ;
-
-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl(this) ;
+    Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
+    wxMacControl* peer = new wxMacControl(wxpeer) ;

 
     OSStatus err = CreateDisclosureTriangleControl(
 
     OSStatus err = CreateDisclosureTriangleControl(

-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, 
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,

             kControlDisclosureTrianglePointDefault,
             wxCFStringRef( label ),
             0,    // closed
             TRUE, // draw title
             TRUE, // auto toggle back and forth
             kControlDisclosureTrianglePointDefault,
             wxCFStringRef( label ),
             0,    // closed
             TRUE, // draw title
             TRUE, // auto toggle back and forth

-            m_peer->GetControlRefAddr() );
-           
-    verify_noerr( err );
-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
-
-    MacPostControlCreate( pos, size );
-    // passing the text in the param doesn't seem to work, so lets do if again
-    SetLabel( label );
-    
-    return true;
-}
-
-void wxDisclosureTriangle::SetOpen( bool open )
-{
-    m_peer->SetValue( open ? 1 : 0 );
-}
+            peer->GetControlRefAddr() );

 
 

-bool wxDisclosureTriangle::IsOpen() const
-{
-   return m_peer->GetValue() == 1;
-}
-
-wxInt32 wxDisclosureTriangle::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
-{
-    // Just emit button event for now
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
-    event.SetEventObject(this);
-    ProcessCommand(event);
-
-    return noErr;
-}
-
-wxSize wxDisclosureTriangle::DoGetBestSize() const
-{
-    return wxSize(16,16);
+    verify_noerr( err );
+    return peer;

 }
 
 
 }