build fix for older GTK2

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

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index b61d2963842926c0824a1cfad00888ebfb7614a8..da3066445292c66b7a2916ddd4604a4169972170 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,13 +17,30 @@
     #include "wx/panel.h"
     #include "wx/toplevel.h"
     #include "wx/dcclient.h"
     #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"
 
 #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

 
 BEGIN_EVENT_TABLE(wxButton, wxControl)
     EVT_ENTER_WINDOW(wxButton::OnEnterWindow)
 
 BEGIN_EVENT_TABLE(wxButton, wxControl)
     EVT_ENTER_WINDOW(wxButton::OnEnterWindow)


@@ -32,13 +49,15 @@ END_EVENT_TABLE()
 
 bool wxButton::Create(wxWindow *parent,
     wxWindowID id,
 
 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)
 {
     const wxPoint& pos,
     const wxSize& size,
     long style,
     const wxValidator& validator,
     const wxString& name)
 {

+    DontCreatePeer();
+    

     m_marginX =
     m_marginY = 0;
 
     m_marginX =
     m_marginY = 0;
 


@@ -54,11 +73,16 @@ bool wxButton::Create(wxWindow *parent,
                                  validator, name);
     }
 
                                  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;
 
     if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
         return false;


@@ -66,7 +90,7 @@ bool wxButton::Create(wxWindow *parent,
     m_labelOrig =
     m_label = label ;
 
     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 );
 
 
     MacPostControlCreate( pos, size );
 


@@ -75,7 +99,13 @@ bool wxButton::Create(wxWindow *parent,
 
 void wxButton::SetLabel(const wxString& label)
 {
 
 void wxButton::SetLabel(const wxString& label)
 {

-    if ( GetId() == wxID_HELP || HasFlag(wxBU_NOTEXT) )
+    if ( IsHelpButtonWithStandardLabel(GetId(), label) )
+    {
+        // ignore the standard label for the help buttons, it's not used
+        return;
+    }
+
+    if ( HasFlag(wxBU_NOTEXT) )

     {
         // just store the label internally but don't really use it for the
         // button
     {
         // just store the label internally but don't really use it for the
         // button


@@ -95,22 +125,38 @@ wxBitmap wxButton::DoGetBitmap(State which) const
 void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 {
     m_bitmaps[which] = bitmap;
 void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 {
     m_bitmaps[which] = bitmap;

-    
+

     if ( which == State_Normal )
     if ( which == State_Normal )

-        m_peer->SetBitmap(bitmap);
+        GetPeer()->SetBitmap(bitmap);

     else if ( which == State_Pressed )
     {
     else if ( which == State_Pressed )
     {

-        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (m_peer);
+        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (GetPeer());

         if ( bi )
             bi->SetPressedBitmap(bitmap);
     }
         if ( bi )
             bi->SetPressedBitmap(bitmap);
     }

+    InvalidateBestSize();

 }
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {
 }
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {

-    m_peer->SetBitmapPosition(dir);
+    GetPeer()->SetBitmapPosition(dir);
+    InvalidateBestSize();
+}
+
+#if wxUSE_MARKUP && wxOSX_USE_COCOA
+
+bool wxButton::DoSetLabelMarkup(const wxString& markup)
+{
+    if ( !wxButtonBase::DoSetLabelMarkup(markup) )
+        return false;
+
+    GetPeer()->SetLabelMarkup(markup);
+
+    return true;

 }
 
 }
 

+#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
+

 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();
 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();


@@ -120,27 +166,27 @@ wxWindow *wxButton::SetDefault()
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 

-    m_peer->SetDefaultButton( true );
+    GetPeer()->SetDefaultButton( true );

 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {
 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {

-    m_peer->PerformClick() ;
+    GetPeer()->PerformClick() ;

     // ProcessCommand(event);
 }
 
 void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
     // ProcessCommand(event);
 }
 
 void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )

-        m_peer->SetBitmap( DoGetBitmap( State_Current ) );       
+        GetPeer()->SetBitmap( DoGetBitmap( State_Current ) );

 }
 
 void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
 }
 
 void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )

-        m_peer->SetBitmap( DoGetBitmap( State_Normal ) );       
+        GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) );

 }
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )


@@ -157,16 +203,15 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 
 bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxString& label,
    const wxPoint& pos, const wxSize& size, long style,const wxValidator& validator, const wxString& name )
 
 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;
 
     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 );
 
     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;
     SetLabel( label );
 
     return true;


@@ -174,12 +219,12 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {

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

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

-   return m_peer->GetValue() == 1;
+   return GetPeer()->GetValue() == 1;

 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )