Applied Kevin Hock's combobox patch for text update events

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e3a010662fea6e5093544a71b8e79eceae6cc0f7..435358d25ffb4da2b54cc1402e327246d47c3726 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_BUTTON
 
 #include "wx/button.h"
+#include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
 
@@ -109,8 +110,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 */
 
 #ifdef __WXGTK20__
-    if (m_widget == NULL) // may be !=NULL if stock form of Create was used
-        m_widget = gtk_button_new_with_mnemonic("");
+    m_widget = gtk_button_new_with_mnemonic("");
 #else
     m_widget = gtk_button_new_with_label("");
 #endif
@@ -127,15 +127,15 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
-#ifdef __WXGTK20__
+#if GTK_CHECK_VERSION(2,4,0)
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 #else
-    gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                            x_alignment, y_alignment);
+    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+                                x_alignment, y_alignment);
 #endif
 
-    if (!label.empty())
-        SetLabel(label);
+    SetLabel(label);
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
@@ -150,20 +150,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     return true;
 }
     
-bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-                      const wxString& descriptiveLabel,
-                      const wxPoint& pos, long style,
-                      const wxValidator& validator, const wxString& name)
-{
-#ifdef __WXGTK20__
-    m_widget = gtk_button_new_from_stock(wxStockItemToGTK(stock));
-    return Create(parent, id, wxEmptyString,
-                  pos, wxDefaultSize, style, validator, name);
-#else
-    return CreateStock(parent, id, stock, descriptiveLabel,
-                       pos, style, validator, name);
-#endif
-}
 
 void wxButton::SetDefault()
 {
@@ -217,17 +203,34 @@ wxSize wxButtonBase::GetDefaultSize()
 #endif
 }
 
-void wxButton::SetLabel( const wxString &label )
+void wxButton::SetLabel( const wxString &lbl )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
-    wxControl::SetLabel( label );
+    wxString label(lbl);
+
+    if (label.empty() && wxIsStockID(m_windowId))
+        label = wxGetStockLabel(m_windowId);
+
+    wxControl::SetLabel(label);
 
 #ifdef __WXGTK20__
-    wxString label2 = PrepareLabelMnemonics( label );
-    gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) );
+    if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
+    {
+        const char *stock = wxGetStockGtkID(m_windowId);
+        if (stock)
+        {
+            gtk_button_set_label(GTK_BUTTON(m_widget), stock);
+            gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE);
+            return;
+        }
+    }
+
+    wxString label2 = PrepareLabelMnemonics(label);
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
+    gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
 #else
-    gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
+    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel()));
 #endif
 }