implement new wxBG_STYLE_XXX semantics for wxMSW too

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

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 239ded9d35f83b6d7308b05034a6ab78b4dc80d0..6428e4842ac7219525e83d1922f2f284141df948 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);
     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 ;
         label = wxGetStockLabel(id);
 
     m_macIsUserPane = false ;


@@ -44,7 +44,7 @@ bool wxButton::Create(wxWindow *parent,
         return false;
 
     m_labelOrig = m_label = label ;
         return false;
 
     m_labelOrig = m_label = label ;

-    
+

     m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
     m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );


@@ -66,13 +66,13 @@ wxWindow *wxButton::SetDefault()
     return btnOldDefault;
 }
 
     return btnOldDefault;
 }
 

-void wxButton::Command (wxCommandEvent & event)
+void wxButton::Command (wxCommandEvent & WXUNUSED(event))

 {
     m_peer->PerformClick() ;
     // ProcessCommand(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);
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
     event.SetEventObject(this);


@@ -92,45 +92,26 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     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 );
 
     MacPostControlCreate( pos, size );

-    // passing the text in the param doesn't seem to work, so lets do if again
+    // passing the text in the param doesn't seem to work, so lets do it again

     SetLabel( label );
     SetLabel( label );

-    
+

     return true;
 }
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
     return true;
 }
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {

-#if wxOSX_USE_CARBON

     m_peer->SetValue( open ? 1 : 0 );
     m_peer->SetValue( open ? 1 : 0 );

-#endif

 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {
 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {

-#if wxOSX_USE_CARBON

    return m_peer->GetValue() == 1;
    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);
 {
     // Just emit button event for now
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);


@@ -142,6 +123,14 @@ bool wxDisclosureTriangle::HandleClicked( double timestampsec )
 
 wxSize wxDisclosureTriangle::DoGetBestSize() const
 {
 
 wxSize wxDisclosureTriangle::DoGetBestSize() const
 {

-    return wxSize(16,16);
+    wxSize size = wxWindow::DoGetBestSize();
+
+    // under Carbon the base class GetBestSize() implementation doesn't seem to
+    // take the label into account at all, correct for it here
+#if wxOSX_USE_CARBON
+    size.x += GetTextExtent(GetLabel()).x;
+#endif // wxOSX_USE_CARBON
+
+    return size;

 }
 
 }