X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab0f37b97b488f0ec3082dbb0abac66bd0c48bd6..5c7b506103cfc078a821860766e31c47d595e07f:/src/mac/carbon/button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 9da363eb50..87fa56c82b 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -16,6 +16,7 @@
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
     #include "wx/toplevel.h"
+    #include "wx/dcclient.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -60,7 +61,6 @@ bool wxButton::Create(wxWindow *parent,
     }
     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
         if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
         {
@@ -77,8 +77,6 @@ bool wxButton::Create(wxWindow *parent,
             bounds.bottom = bounds.top + 15 ;
             m_maxHeight = 15 ;
         }
-#endif
-
         err = CreatePushButtonControl(
             MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
             &bounds, CFSTR(""), m_peer->GetControlRefAddr() );
@@ -122,14 +120,12 @@ wxSize wxButton::DoGetBestSize() const
         return wxSize( 20 , 20 ) ;
 
     wxSize sz = GetDefaultSize() ;
-    int charspace = 8 ;
 
     switch (GetWindowVariant())
     {
         case wxWINDOW_VARIANT_NORMAL:
         case wxWINDOW_VARIANT_LARGE:
             sz.y = 20 ;
-            charspace = 10 ;
             break;
 
         case wxWINDOW_VARIANT_SMALL:
@@ -148,14 +144,42 @@ wxSize wxButton::DoGetBestSize() const
     m_peer->GetBestRect( &bestsize ) ;
 
     int wBtn;
-    if ( EmptyRect( &bestsize ) )
+    if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
     {
-        wBtn = m_label.length() * charspace + 12 ;
+        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 ;
-        sz.y = bestsize.bottom - bestsize.top ;
+        // non 'normal' window variants don't return the correct height
+        // sz.y = bestsize.bottom - bestsize.top ;
     }
 
     if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
@@ -186,3 +210,64 @@ wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF
 
     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) ;
+
+    OSStatus err = CreateDisclosureTriangleControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, 
+            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 );
+}
+
+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);
+}
+
+