missing commit

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index ca57fcc514b735b176ea9c5d9dde0480f2709f98..a2ec92fdde239c3d860c2a4668e1ec5e771e5b2a 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        src/gtk/button.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,131 +10,103 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_BUTTON
 
 #if wxUSE_BUTTON
 

-#include "wx/button.h"
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+

 #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/win_gtk.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/list.h"

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxButton;
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "clicked"
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-    if (g_isIdle)
-       wxapp_install_idle_handler();

 
 

-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
+static void
+wxgtk_button_clicked_callback(GtkWidget *WXUNUSED(widget), wxButton *button)
+{
+    if ( button->GTKShouldIgnoreEvent() )
+        return;

 
 

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

     event.SetEventObject(button);
     event.SetEventObject(button);

-    button->GetEventHandler()->ProcessEvent(event);
-}
+    button->HandleWindowEvent(event);

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

-static gint
-gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
+static void
+wxgtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    int left_border = 0;
-    int right_border = 0;
-    int top_border = 0;
-    int bottom_border = 0;
-

     /* the default button has a border around it */
     /* the default button has a border around it */

-    if (GTK_WIDGET_CAN_DEFAULT(m_widget))
+    wxWindow* parent = win->GetParent();
+    if (parent && parent->m_wxwindow && gtk_widget_get_can_default(widget))

     {
     {

-#ifdef __WXGTK20__
-        GtkBorder *default_border = NULL;
-        gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
-        if (default_border)
+        GtkBorder* border = NULL;
+        gtk_widget_style_get(widget, "default_border", &border, NULL);
+        if (border)

         {
         {

-            left_border += default_border->left;
-            right_border += default_border->right;
-            top_border += default_border->top;
-            bottom_border += default_border->bottom;
-            g_free( default_border );
+            win->MoveWindow(
+                win->m_x - border->left,
+                win->m_y - border->top,
+                win->m_width + border->left + border->right,
+                win->m_height + border->top + border->bottom);
+            gtk_border_free(border);

         }
         }

-#else
-        left_border = 6;
-        right_border = 6;
-        top_border = 6;
-        bottom_border = 5;
-#endif
-        win->DoMoveWindow( win->m_x-top_border,
-                           win->m_y-left_border,
-                           win->m_width+left_border+right_border,
-                           win->m_height+top_border+bottom_border );

     }
     }

-
-    return FALSE;

 }
 
 }
 

+} // extern "C"
+

 //-----------------------------------------------------------------------------
 // wxButton
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
-wxButton::wxButton()
+bool wxButton::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxString &label,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
 {

-}
-
-wxButton::~wxButton()
-{
-}
-
-bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxValidator& validator, const wxString &name )
-{
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );

-        return FALSE;
+        return false;

     }
 
     }
 

-#ifdef __WXGTK20__
-    m_widget = gtk_button_new_with_mnemonic("");
-#else
-    m_widget = gtk_button_new_with_label("");
-#endif
+    // 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;
     if (HasFlag(wxBU_LEFT))
 
     float x_alignment = 0.5;
     if (HasFlag(wxBU_LEFT))


@@ -148,29 +120,21 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 

-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
-    }
-    else
-#endif
-    {
-        if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
-            gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (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 );
 

-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (wxgtk_button_clicked_callback),
+                            this);

 
 

-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set",
-      GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this );
+    g_signal_connect_after (m_widget, "style_set",
+                            G_CALLBACK (wxgtk_button_style_set_callback),
+                            this);

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


@@ -180,24 +144,22 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 }
 
 
 }
 
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

-    wxWindow *parent = GetParent();
-    wxCHECK_RET( parent, _T("button without parent?") );
-
-    parent->SetDefaultItem(this);
+    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;

 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {

-#ifdef __WXGTK20__

     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)
     {
     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)
     {


@@ -209,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,


@@ -228,9 +190,6 @@ wxSize wxButtonBase::GetDefaultSize()
         gtk_widget_destroy(wnd);
     }
     return size;
         gtk_widget_destroy(wnd);
     }
     return size;

-#else
-    return wxSize(80,26);
-#endif

 }
 
 void wxButton::SetLabel( const wxString &lbl )
 }
 
 void wxButton::SetLabel( const wxString &lbl )


@@ -242,11 +201,12 @@ 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);

 
 

-    const wxString labelGTK = GTKConvertMnemonics(label);
+    // don't use label if it was explicitly disabled
+    if ( HasFlag(wxBU_NOTEXT) )
+        return;

 
 

-#ifdef __WXGTK20__

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


@@ -258,70 +218,107 @@ 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);
 
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
 

-    ApplyWidgetStyle( false );
-#else // GTK+ 1
-    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK));
-#endif // GTK+ 2/1
+    GTKApplyWidgetStyle( false );

 }
 
 }
 

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

 {
 {

-    if ( !wxControl::Enable( enable ) )
-        return FALSE;
+    wxCHECK_MSG( m_widget != NULL, false, "invalid button" );
+
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )
+        return false;
+
+    wxControl::SetLabel(stripped);

 
 

-    gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+    GtkLabel * const label = GTKGetLabel();
+    wxCHECK_MSG( label, false, "no label in this button?" );

 
 

-    return TRUE;
+    GTKSetLabelWithMarkupForLabel(label, markup);
+
+    return true;

 }
 
 }
 

-bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+GtkLabel *wxButton::GTKGetLabel() const

 {
 {

-#ifdef __WXGTK20__
-    return GTK_BUTTON(m_widget)->event_window;
-#else
-    return (window == m_widget->window);
-#endif
+    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);
-    gtk_widget_modify_style(BUTTON_CHILD(m_widget), 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) )
+    {
+        GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));
+        if ( GTK_IS_BOX(box) )
+        {
+            wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box)));
+            for (GList* item = list; item; item = item->next)
+            {
+                GTKApplyStyle(GTK_WIDGET(item->data), style);
+            }
+        }
+    }

 }
 
 wxSize wxButton::DoGetBestSize() const
 {
     // the default button in wxGTK is bigger than the other ones because of an
     // extra border around it, but we don't want to take it into account in
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
     // the default button in wxGTK is bigger than the other ones because of an
     // extra border around it, but we don't want to take it into account in

-    // our size calculations (otherwsie the result is visually ugly), so
+    // our size calculations (otherwise the result is visually ugly), so

     // always return the size of non default button from here
     // 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);

     }
 
     }
 

-#ifndef __WXGTK20__
-    ret.x += 10;  // add a few pixels for sloppy (but common) themes
-#endif
-

     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();
     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();

-        if (ret.x < defaultSize.x) ret.x = defaultSize.x;
-        if (ret.y < defaultSize.y) ret.y = defaultSize.y;
+        if (ret.x < defaultSize.x)
+            ret.x = defaultSize.x;
+        if (ret.y < defaultSize.y)
+            ret.y = defaultSize.y;

     }
 
     CacheBestSize(ret);
     }
 
     CacheBestSize(ret);


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

-    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new());

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

-