Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

[wxWidgets.git] / src / osx / button_osx.cpp

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 239ded9d35f83b6d7308b05034a6ab78b4dc80d0..70be0e99ce46021a1bf7b8c1016976265424f1a4 100644 (file)
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -35,7 +35,7 @@ bool wxButton::Create(wxWindow *parent,
     const wxString& name)
 {
     wxString label(lbl);
-    if (label.empty() && wxIsStockID(id))
+    if (label.empty() && wxIsStockID(id) && !(id == wxID_HELP))
         label = wxGetStockLabel(id);
 
     m_macIsUserPane = false ;
@@ -66,13 +66,13 @@ wxWindow *wxButton::SetDefault()
     return btnOldDefault;
 }
 
-void wxButton::Command (wxCommandEvent & event)
+void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {
     m_peer->PerformClick() ;
     // ProcessCommand(event);
 }
 
-bool wxButton::HandleClicked( double timestampsec )
+bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
     event.SetEventObject(this);
@@ -92,22 +92,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
-#if wxOSX_USE_CARBON
-    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 );
-#endif
-    wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid Mac control") ) ;
+    m_peer = 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 if again
@@ -118,19 +103,15 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
-#if wxOSX_USE_CARBON
     m_peer->SetValue( open ? 1 : 0 );
-#endif
 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {
-#if wxOSX_USE_CARBON
    return m_peer->GetValue() == 1;
-#endif
 }
 
-bool wxDisclosureTriangle::HandleClicked( double timestampsec )
+bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     // Just emit button event for now
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);