Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 6984a9af080c8e32b4ef56e05a7c8de42d02311c..bd55cf3c46de544ec59b0075b6636a8eddf21f9a 100644 (file)
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -51,23 +51,23 @@ bool wxButton::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
     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
     //        CreateButton()) for creating bitmap buttons, but we really ought
     //        to unify the creation of buttons of all kinds and then remove
     //        this check
     // 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
     //        CreateButton()) for creating bitmap buttons, but we really ought
     //        to unify the creation of buttons of all kinds and then remove
     //        this check

-    if ( style & wxBU_NOTEXT )
+    if ( style & wxBU_NOTEXT && !ShouldCreatePeer() )

     {
         return wxControl::Create(parent, id, pos, size, style,
                                  validator, name);
     }
 
     {
         return wxControl::Create(parent, id, pos, size, style,
                                  validator, name);
     }
 

+    DontCreatePeer();
+
+    m_marginX =
+    m_marginY = 0;
+

     wxString label;
 
     // Ignore the standard label for help buttons if possible, they use "?"
     wxString label;
 
     // Ignore the standard label for help buttons if possible, they use "?"


@@ -101,6 +101,9 @@ void wxButton::SetLabel(const wxString& label)
     }
 
     wxAnyButton::SetLabel(label);
     }
 
     wxAnyButton::SetLabel(label);

+#if wxOSX_USE_COCOA
+    OSXUpdateAfterLabelChange(label);
+#endif

 }
 
 wxWindow *wxButton::SetDefault()
 }
 
 wxWindow *wxButton::SetDefault()


@@ -125,7 +128,7 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);

     event.SetEventObject(this);
     ProcessCommand(event);
     return true;
     event.SetEventObject(this);
     ProcessCommand(event);
     return true;


@@ -170,7 +173,7 @@ bool wxDisclosureTriangle::IsOpen() const
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     // Just emit button event for now
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     // Just emit button event for now

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);

     event.SetEventObject(this);
     ProcessCommand(event);
 
     event.SetEventObject(this);
     ProcessCommand(event);