X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ac0ac7c1b1c0e4c37f3729e139c4cca76bbe0b7..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/osx/button_osx.cpp?ds=sidebyside

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 52208f4ed2..6984a9af08 100644
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button.cpp 54845 2008-07-30 14:52:41Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,23 +17,45 @@
     #include "wx/panel.h"
     #include "wx/toplevel.h"
     #include "wx/dcclient.h"
+    #include "wx/stattext.h"
 #endif
 
 #include "wx/stockitem.h"
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+namespace
+{
+
+// Returns true only if the id is wxID_HELP and the label is "Help" or empty.
+bool IsHelpButtonWithStandardLabel(wxWindowID id, const wxString& label)
+{
+    if ( id != wxID_HELP )
+        return false;
+
+    if ( label.empty() )
+        return true;
+
+    const wxString labelText = wxStaticText::GetLabelText(label);
+    return labelText == "Help" || labelText == _("Help");
+}
+
+} // anonymous namespace
 
 bool wxButton::Create(wxWindow *parent,
     wxWindowID id,
-    const wxString& lbl,
+    const wxString& labelOrig,
     const wxPoint& pos,
     const wxSize& size,
     long style,
     const wxValidator& validator,
     const wxString& name)
 {
+    DontCreatePeer();
+    
+    m_marginX =
+    m_marginY = 0;
+
     // FIXME: this hack is needed because we're called from
     //        wxBitmapButton::Create() with this style and we currently use a
     //        different wxWidgetImpl method (CreateBitmapButton() rather than
@@ -46,11 +68,16 @@ bool wxButton::Create(wxWindow *parent,
                                  validator, name);
     }
 
-    wxString label(lbl);
-    if (label.empty() && wxIsStockID(id) && !(id == wxID_HELP))
-        label = wxGetStockLabel(id);
+    wxString label;
+
+    // Ignore the standard label for help buttons if possible, they use "?"
+    // label under Mac which looks better.
+    if ( !IsHelpButtonWithStandardLabel(id, labelOrig) )
+    {
+        label = labelOrig.empty() && wxIsStockID(id) ? wxGetStockLabel(id)
+                                                     : labelOrig;
+    }
 
-    m_macIsUserPane = false ;
 
     if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
@@ -58,7 +85,7 @@ bool wxButton::Create(wxWindow *parent,
     m_labelOrig =
     m_label = label ;
 
-    m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
 
@@ -67,40 +94,15 @@ bool wxButton::Create(wxWindow *parent,
 
 void wxButton::SetLabel(const wxString& label)
 {
-    if ( GetId() == wxID_HELP || HasFlag(wxBU_NOTEXT) )
+    if ( IsHelpButtonWithStandardLabel(GetId(), label) )
     {
-        // just store the label internally but don't really use it for the
-        // button
-        m_labelOrig =
-        m_label = label;
+        // ignore the standard label for the help buttons, it's not used
         return;
     }
 
-    wxButtonBase::SetLabel(label);
-}
-
-// there is no support for button bitmaps in wxOSX/Carbon so there is no need
-// for these methods there
-#if wxOSX_USE_COCOA
-
-wxBitmap wxButton::DoGetBitmap(State which) const
-{
-    return which == State_Normal ? m_peer->GetBitmap() : wxBitmap();
-}
-
-void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
-{
-    if ( which == State_Normal )
-        m_peer->SetBitmap(bitmap);
-}
-
-void wxButton::DoSetBitmapPosition(wxDirection dir)
-{
-    m_peer->SetBitmapPosition(dir);
+    wxAnyButton::SetLabel(label);
 }
 
-#endif // wxOSX_USE_COCOA
-
 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();
@@ -110,14 +112,14 @@ wxWindow *wxButton::SetDefault()
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 
-    m_peer->SetDefaultButton( true );
+    GetPeer()->SetDefaultButton( true );
 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {
-    m_peer->PerformClick() ;
+    GetPeer()->PerformClick() ;
     // ProcessCommand(event);
 }
 
@@ -129,22 +131,27 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
     return true;
 }
 
+/* static */
+wxSize wxButtonBase::GetDefaultSize()
+{
+    return wxAnyButton::GetDefaultSize();
+}
+
 //-------------------------------------------------------
 // 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 ;
-
+{    
+    DontCreatePeer();
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
-    m_peer = wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
-    // passing the text in the param doesn't seem to work, so lets do it again
+    // passing the text in the param doesn't seem to work, so let's do it again
     SetLabel( label );
 
     return true;
@@ -152,12 +159,12 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
-    m_peer->SetValue( open ? 1 : 0 );
+    GetPeer()->SetValue( open ? 1 : 0 );
 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {
-   return m_peer->GetValue() == 1;
+   return GetPeer()->GetValue() == 1;
 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )