X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4a4eafbcc77d758d064a52873f5032e25d6020d..5778dedc92f6d31435aa1cda6846979a0e9ad35b:/src/gtk/button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 0b7a033626..88e29ac4f3 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -123,7 +123,24 @@ bool wxButton::Create(wxWindow *parent,
         return false;
     }
 
-    m_widget = gtk_button_new_with_mnemonic("");
+    // create either a standard button with text label (which may still contain
+    // an image under GTK+ 2.6+) or a bitmap-only button if we don't have any
+    // label
+    const bool
+        useLabel = !(style & wxBU_NOTEXT) && (!label.empty() || wxIsStockID(id));
+    if ( useLabel )
+    {
+        m_widget = gtk_button_new_with_mnemonic("");
+    }
+    else // no label, suppose we will have a bitmap
+    {
+        m_widget = gtk_button_new();
+
+        GtkWidget *image = gtk_image_new();
+        gtk_widget_show(image);
+        gtk_container_add(GTK_CONTAINER(m_widget), image);
+    }
+
     g_object_ref(m_widget);
 
     float x_alignment = 0.5;
@@ -140,7 +157,8 @@ bool wxButton::Create(wxWindow *parent,
 
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 
-    SetLabel(label);
+    if ( useLabel )
+        SetLabel(label);
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
@@ -220,6 +238,10 @@ void wxButton::SetLabel( const wxString &lbl )
 
     wxControl::SetLabel(label);
 
+    // don't use label if it was explicitly disabled
+    if ( HasFlag(wxBU_NOTEXT) )
+        return;
+
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
         const char *stock = wxGetStockGtkID(m_windowId);
@@ -231,6 +253,10 @@ void wxButton::SetLabel( const wxString &lbl )
         }
     }
 
+    // this call is necessary if the button had been initially created without
+    // a (text) label -- then we didn't use gtk_button_new_with_mnemonic() and
+    // so "use-underline" GtkButton property remained unset
+    gtk_button_set_use_underline(GTK_BUTTON(m_widget), TRUE);
     const wxString labelGTK = GTKConvertMnemonics(label);
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
@@ -240,17 +266,13 @@ void wxButton::SetLabel( const wxString &lbl )
 
 bool wxButton::Enable( bool enable )
 {
-    bool isEnabled = IsEnabled();
-
-    if ( !wxControl::Enable( enable ) )
+    if (!base_type::Enable(enable))
         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 
-    if (!isEnabled && enable)
-    {
+    if (enable)
         GTKFixSensitivity();
-    }
 
     GTKUpdateBitmap();
 
@@ -383,24 +405,50 @@ wxButton::State wxButton::GTKGetCurrentState() const
 
 void wxButton::GTKUpdateBitmap()
 {
-    State state = GTKGetCurrentState();
+    // if we don't show bitmaps at all, there is nothing to update
+    if ( m_bitmaps[State_Normal].IsOk() )
+    {
+        // if we do show them, this will return a state for which we do have a
+        // valid bitmap
+        State state = GTKGetCurrentState();
 
-    GTKDoShowBitmap(m_bitmaps[state]);
+        GTKDoShowBitmap(m_bitmaps[state]);
+    }
 }
 
 void wxButton::GTKDoShowBitmap(const wxBitmap& bitmap)
 {
     wxASSERT_MSG( bitmap.IsOk(), "invalid bitmap" );
 
-#ifdef __WXGTK26__
-    if ( !gtk_check_version(2,6,0) )
+    GtkWidget *image;
+    if ( DontShowLabel() )
     {
-        GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
-        wxCHECK_RET( image, "must have image widget" );
-
-        gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
+        image = GTK_BIN(m_widget)->child;
     }
+    else // have both label and bitmap
+    {
+#ifdef __WXGTK26__
+        if ( !gtk_check_version(2,6,0) )
+        {
+            image = gtk_button_get_image(GTK_BUTTON(m_widget));
+        }
+        else
 #endif // __WXGTK26__
+        {
+            // buttons with both label and bitmap are only supported with GTK+
+            // 2.6 so far
+            //
+            // it shouldn't be difficult to implement them ourselves for the
+            // previous GTK+ versions by stuffing a container with a label and
+            // an image inside GtkButton but there doesn't seem to be much
+            // point in doing this for ancient GTK+ versions
+            return;
+        }
+    }
+
+    wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" );
+
+    gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
 }
 
 wxBitmap wxButton::DoGetBitmap(State which) const
@@ -413,10 +461,17 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
     switch ( which )
     {
         case State_Normal:
+            if ( DontShowLabel() )
+            {
+                // we only have the bitmap in this button, never remove it but
+                // do invalidate the best size when the bitmap (and presumably
+                // its size) changes
+                InvalidateBestSize();
+            }
 #ifdef __WXGTK26__
             // normal image is special: setting it enables images for the button and
             // resetting it to nothing disables all of them
-            if ( !gtk_check_version(2,6,0) )
+            else if ( !gtk_check_version(2,6,0) )
             {
                 GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
                 if ( image && !bitmap.IsOk() )
@@ -609,6 +664,7 @@ void wxButton::DoSetBitmapPosition(wxDirection dir)
         }
 
         gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos);
+        InvalidateBestSize();
     }
 #endif // GTK+ 2.10+
 }