adapting to init pattern

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 0b7a033626b9d6265b878b026a023a591332cb96..2d83f10cbf2cfacf8cf67c4d6565c9d7d9187959 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -83,7 +83,7 @@ wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
 {
     /* the default button has a border around it */
     wxWindow* parent = win->GetParent();
 {
     /* the default button has a border around it */
     wxWindow* parent = win->GetParent();

-    if (parent && parent->m_wxwindow && GTK_WIDGET_CAN_DEFAULT(widget))
+    if (parent && parent->m_wxwindow && gtk_widget_get_can_default(widget))

     {
         GtkBorder* border = NULL;
         gtk_widget_style_get(widget, "default_border", &border, NULL);
     {
         GtkBorder* border = NULL;
         gtk_widget_style_get(widget, "default_border", &border, NULL);


@@ -105,8 +105,6 @@ wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
 // wxButton
 //-----------------------------------------------------------------------------
 
 // wxButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-

 bool wxButton::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxString &label,
 bool wxButton::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxString &label,


@@ -123,7 +121,24 @@ bool wxButton::Create(wxWindow *parent,
         return false;
     }
 
         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;
     g_object_ref(m_widget);
 
     float x_alignment = 0.5;


@@ -140,7 +155,8 @@ bool wxButton::Create(wxWindow *parent,
 
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 
 
     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 );
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );


@@ -165,7 +181,7 @@ wxWindow *wxButton::SetDefault()
 {
     wxWindow *oldDefault = wxButtonBase::SetDefault();
 
 {
     wxWindow *oldDefault = wxButtonBase::SetDefault();
 

-    GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+    gtk_widget_set_can_default(m_widget, TRUE);

     gtk_widget_grab_default( m_widget );
 
     // resize for default border
     gtk_widget_grab_default( m_widget );
 
     // resize for default border


@@ -220,6 +236,10 @@ void wxButton::SetLabel( const wxString &lbl )
 
     wxControl::SetLabel(label);
 
 
     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);
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
         const char *stock = wxGetStockGtkID(m_windowId);


@@ -231,6 +251,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);
     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);


@@ -238,19 +262,35 @@ void wxButton::SetLabel( const wxString &lbl )
     GTKApplyWidgetStyle( false );
 }
 
     GTKApplyWidgetStyle( false );
 }
 

-bool wxButton::Enable( bool enable )
+#if wxUSE_MARKUP
+bool wxButton::DoSetLabelMarkup(const wxString& markup)

 {
 {

-    bool isEnabled = IsEnabled();
+    wxCHECK_MSG( m_widget != NULL, false, "invalid button" );

 
 

-    if ( !wxControl::Enable( enable ) )
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )

         return false;
 
         return false;
 

-    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+    wxControl::SetLabel(stripped);

 
 

-    if (!isEnabled && enable)
-    {
+    GtkLabel * const label = GTKGetLabel();
+    wxCHECK_MSG( label, false, "no label in this button?" );
+
+    GTKSetLabelWithMarkupForLabel(label, markup);
+
+    return true;
+}
+#endif // wxUSE_MARKUP
+
+bool wxButton::Enable( bool enable )
+{
+    if (!base_type::Enable(enable))
+        return false;
+
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);
+
+    if (enable)

         GTKFixSensitivity();
         GTKFixSensitivity();

-    }

 
     GTKUpdateBitmap();
 
 
     GTKUpdateBitmap();
 


@@ -262,24 +302,48 @@ GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
     return GTK_BUTTON(m_widget)->event_window;
 }
 
     return GTK_BUTTON(m_widget)->event_window;
 }
 

+GtkLabel *wxButton::GTKGetLabel() const
+{
+    GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
+    if ( GTK_IS_ALIGNMENT(child) )
+    {
+        GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));
+        GtkLabel* label = NULL;
+        GList* list = gtk_container_get_children(GTK_CONTAINER(box));
+        for (GList* item = list; item; item = item->next)
+        {
+            GtkBoxChild* boxChild = static_cast<GtkBoxChild*>(item->data);
+            if ( GTK_IS_LABEL(boxChild->widget) )
+                label = GTK_LABEL(boxChild->widget);
+        }
+        g_list_free(list);
+
+        return label;
+    }
+
+    return GTK_LABEL(child);
+}
+

 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);

-    GtkWidget *child = GTK_BIN(m_widget)->child;
+    GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));

     gtk_widget_modify_style(child, style);
 
     // for buttons with images, the path to the label is (at least in 2.12)
     // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
     if ( GTK_IS_ALIGNMENT(child) )
     {
     gtk_widget_modify_style(child, style);
 
     // for buttons with images, the path to the label is (at least in 2.12)
     // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
     if ( GTK_IS_ALIGNMENT(child) )
     {

-        GtkWidget *box = GTK_BIN(child)->child;
+        GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));

         if ( GTK_IS_BOX(box) )
         {
         if ( GTK_IS_BOX(box) )
         {

-            for (GList* item = GTK_BOX(box)->children; item; item = item->next)
+            GList* list = gtk_container_get_children(GTK_CONTAINER(box));
+            for (GList* item = list; item; item = item->next)

             {
                 GtkBoxChild* boxChild = static_cast<GtkBoxChild*>(item->data);
                 gtk_widget_modify_style(boxChild->widget, style);
             }
             {
                 GtkBoxChild* boxChild = static_cast<GtkBoxChild*>(item->data);
                 gtk_widget_modify_style(boxChild->widget, style);
             }

+            g_list_free(list);

         }
     }
 }
         }
     }
 }


@@ -290,11 +354,11 @@ wxSize wxButton::DoGetBestSize() const
     // extra border around it, but we don't want to take it into account in
     // our size calculations (otherwise the result is visually ugly), so
     // always return the size of non default button from here
     // extra border around it, but we don't want to take it into account in
     // our size calculations (otherwise the result is visually ugly), so
     // always return the size of non default button from here

-    const bool isDefault = GTK_WIDGET_HAS_DEFAULT(m_widget);
+    const bool isDefault = gtk_widget_has_default(m_widget);

     if ( isDefault )
     {
         // temporarily unset default flag
     if ( isDefault )
     {
         // temporarily unset default flag

-        GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+        gtk_widget_set_can_default(m_widget, FALSE);

     }
 
     wxSize ret( wxControl::DoGetBestSize() );
     }
 
     wxSize ret( wxControl::DoGetBestSize() );


@@ -302,7 +366,7 @@ wxSize wxButton::DoGetBestSize() const
     if ( isDefault )
     {
         // set it back again
     if ( isDefault )
     {
         // set it back again

-        GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
+        gtk_widget_set_can_default(m_widget, TRUE);

     }
 
     if (!HasFlag(wxBU_EXACTFIT))
     }
 
     if (!HasFlag(wxBU_EXACTFIT))


@@ -383,24 +447,50 @@ wxButton::State wxButton::GTKGetCurrentState() const
 
 void wxButton::GTKUpdateBitmap()
 {
 
 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" );
 
 }
 
 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_get_child(GTK_BIN(m_widget));

     }
     }

+    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__
 #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
 }
 
 wxBitmap wxButton::DoGetBitmap(State which) const


@@ -413,10 +503,17 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
     switch ( which )
     {
         case State_Normal:
     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
 #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() )
             {
                 GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
                 if ( image && !bitmap.IsOk() )


@@ -609,6 +706,7 @@ void wxButton::DoSetBitmapPosition(wxDirection dir)
         }
 
         gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos);
         }
 
         gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos);

+        InvalidateBestSize();

     }
 #endif // GTK+ 2.10+
 }
     }
 #endif // GTK+ 2.10+
 }