Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 71b8bd98fff8aeb1e30cf3abf8d5d8658778f3fb..a2ec92fdde239c3d860c2a4668e1ec5e771e5b2a 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -18,41 +18,39 @@
 
 #include "wx/stockitem.h"
 
 
 #include "wx/stockitem.h"
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/list.h"

 
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// "clicked"
-//-----------------------------------------------------------------------------
+extern "C"
+{

 
 

-extern "C" {
-static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
+static void
+wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button)

 {
 {

-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
+    if ( button->GTKShouldIgnoreEvent() )
+        return;

 
 

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    wxCommandEvent event(wxEVT_BUTTON, button->GetId());

     event.SetEventObject(button);
     button->HandleWindowEvent(event);
 }
     event.SetEventObject(button);
     button->HandleWindowEvent(event);
 }

-}

 
 //-----------------------------------------------------------------------------
 // "style_set" from m_widget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "style_set" from m_widget
 //-----------------------------------------------------------------------------
 

-extern "C" {

 static void
 static void

-gtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
+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);


@@ -67,14 +65,13 @@ gtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
         }
     }
 }
         }
     }
 }

-}
+
+} // extern "C"

 
 //-----------------------------------------------------------------------------
 // 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,


@@ -91,7 +88,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;


@@ -108,17 +122,18 @@ 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 );
 
     g_signal_connect_after (m_widget, "clicked",
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
     g_signal_connect_after (m_widget, "clicked",

-                            G_CALLBACK (gtk_button_clicked_callback),
+                            G_CALLBACK (wxgtk_button_clicked_callback),

                             this);
 
     g_signal_connect_after (m_widget, "style_set",
                             this);
 
     g_signal_connect_after (m_widget, "style_set",

-                            G_CALLBACK (gtk_button_style_set_callback),
+                            G_CALLBACK (wxgtk_button_style_set_callback),

                             this);
 
     m_parent->DoAddChild( this );
                             this);
 
     m_parent->DoAddChild( this );


@@ -133,11 +148,11 @@ 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

-    gtk_button_style_set_callback( m_widget, NULL, this );
+    wxgtk_button_style_set_callback( m_widget, NULL, this );

 
     return oldDefault;
 }
 
     return oldDefault;
 }


@@ -156,12 +171,12 @@ wxSize wxButtonBase::GetDefaultSize()
         //     button's size. We have to retrieve both values and combine them.
 
         GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         //     button's size. We have to retrieve both values and combine them.
 
         GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);

-        GtkWidget *box = gtk_hbutton_box_new();
+        GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);

         GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
         gtk_container_add(GTK_CONTAINER(box), btn);
         gtk_container_add(GTK_CONTAINER(wnd), box);
         GtkRequisition req;
         GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
         gtk_container_add(GTK_CONTAINER(box), btn);
         gtk_container_add(GTK_CONTAINER(wnd), box);
         GtkRequisition req;

-        gtk_widget_size_request(btn, &req);
+        gtk_widget_get_preferred_size(btn, NULL, &req);

 
         gint minwidth, minheight;
         gtk_widget_style_get(box,
 
         gint minwidth, minheight;
         gtk_widget_style_get(box,


@@ -186,7 +201,11 @@ void wxButton::SetLabel( const wxString &lbl )
     if (label.empty() && wxIsStockID(m_windowId))
         label = wxGetStockLabel(m_windowId);
 
     if (label.empty() && wxIsStockID(m_windowId))
         label = wxGetStockLabel(m_windowId);
 

-    wxControl::SetLabel(label);
+    wxAnyButton::SetLabel(label);
+
+    // don't use label if it was explicitly disabled
+    if ( HasFlag(wxBU_NOTEXT) )
+        return;

 
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
 
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {


@@ -199,6 +218,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);


@@ -206,45 +229,63 @@ 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)
-    {
-        GTKFixSensitivity();
-    }
+    GtkLabel * const label = GTKGetLabel();
+    wxCHECK_MSG( label, false, "no label in this button?" );
+
+    GTKSetLabelWithMarkupForLabel(label, markup);

 
     return true;
 }
 
 
     return true;
 }
 

-GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+GtkLabel *wxButton::GTKGetLabel() const

 {
 {

-    return GTK_BUTTON(m_widget)->event_window;
+    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;
+        wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box)));
+        for (GList* item = list; item; item = item->next)
+        {
+            if (GTK_IS_LABEL(item->data))
+                label = GTK_LABEL(item->data);
+        }
+
+        return label;
+    }
+
+    return GTK_LABEL(child);

 }
 }

+#endif // wxUSE_MARKUP

 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    gtk_widget_modify_style(m_widget, style);
-    GtkWidget *child = GTK_BIN(m_widget)->child;
-    gtk_widget_modify_style(child, style);
+    GTKApplyStyle(m_widget, style);
+    GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
+    GTKApplyStyle(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) )
     {
 
     // 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)
+            wxGtkList 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);
+                GTKApplyStyle(GTK_WIDGET(item->data), style);

             }
         }
     }
             }
         }
     }


@@ -256,19 +297,19 @@ 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) != 0;

     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( wxAnyButton::DoGetBestSize() );

 
     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))


@@ -288,84 +329,7 @@ wxSize wxButton::DoGetBestSize() const
 wxVisualAttributes
 wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
-}
-
-// ----------------------------------------------------------------------------
-// bitmaps support
-// ----------------------------------------------------------------------------
-
-wxBitmap wxButton::DoGetBitmap(State which) const
-{
-    return m_bitmaps[which];
-}
-
-void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
-{
-#ifdef __WXGTK26__
-    // normal image is special: setting it enables images for the button and
-    // resetting it to nothing disables all of them
-    if ( which == State_Normal )
-    {
-        if ( !gtk_check_version(2,6,0) )
-        {
-            GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
-            if ( image && !bitmap.IsOk() )
-            {
-                gtk_container_remove(GTK_CONTAINER(m_widget), image);
-                InvalidateBestSize();
-            }
-            else if ( !image && bitmap.IsOk() )
-            {
-                image = gtk_image_new();
-                gtk_button_set_image(GTK_BUTTON(m_widget), image);
-                InvalidateBestSize();
-            }
-            //else: image presence or absence didn't change
-
-            if ( bitmap.IsOk() )
-            {
-                gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
-            }
-        }
-    }
-#endif // GTK+ 2.6+
-
-    m_bitmaps[which] = bitmap;
-}
-
-void wxButton::DoSetBitmapPosition(wxDirection dir)
-{
-#ifdef __WXGTK210__
-    if ( !gtk_check_version(2,10,0) )
-    {
-        GtkPositionType gtkpos;
-        switch ( dir )
-        {
-            default:
-                wxFAIL_MSG( "invalid position" );
-                // fall through
-
-            case wxLEFT:
-                gtkpos = GTK_POS_LEFT;
-                break;
-
-            case wxRIGHT:
-                gtkpos = GTK_POS_RIGHT;
-                break;
-
-            case wxTOP:
-                gtkpos = GTK_POS_TOP;
-                break;
-
-            case wxBOTTOM:
-                gtkpos = GTK_POS_BOTTOM;
-                break;
-        }
-
-        gtk_button_set_image_position(GTK_BUTTON(m_widget), gtkpos);
-    }
-#endif // GTK+ 2.10+
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new());

 }
 
 #endif // wxUSE_BUTTON
 }
 
 #endif // wxUSE_BUTTON