generate wxEVT_COMMAND_TEXT_ENTER for multiline controls too

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index ca57fcc514b735b176ea9c5d9dde0480f2709f98..89271ac2b40eacb8c5f72a82d1f040b167b7db40 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -76,7 +76,6 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
     /* the default button has a border around it */
     if (GTK_WIDGET_CAN_DEFAULT(m_widget))
     {
-#ifdef __WXGTK20__
         GtkBorder *default_border = NULL;
         gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
         if (default_border)
@@ -87,16 +86,11 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
             bottom_border += default_border->bottom;
             g_free( default_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 );
+        win->MoveWindow(
+            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;
@@ -130,11 +124,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
         return FALSE;
     }
 
-#ifdef __WXGTK20__
     m_widget = gtk_button_new_with_mnemonic("");
-#else
-    m_widget = gtk_button_new_with_label("");
-#endif
 
     float x_alignment = 0.5;
     if (HasFlag(wxBU_LEFT))
@@ -156,8 +146,8 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else
 #endif
     {
-        if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
-            gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+        if (GTK_IS_MISC(GTK_BIN(m_widget)->child))
+            gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child),
                                 x_alignment, y_alignment);
     }
 
@@ -166,11 +156,13 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     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 (gtk_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 (gtk_button_style_set_callback),
+                            this);
 
     m_parent->DoAddChild( this );
 
@@ -197,7 +189,6 @@ void wxButton::SetDefault()
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
-#ifdef __WXGTK20__
     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)
     {
@@ -228,9 +219,6 @@ wxSize wxButtonBase::GetDefaultSize()
         gtk_widget_destroy(wnd);
     }
     return size;
-#else
-    return wxSize(80,26);
-#endif
 }
 
 void wxButton::SetLabel( const wxString &lbl )
@@ -246,7 +234,6 @@ void wxButton::SetLabel( const wxString &lbl )
 
     const wxString labelGTK = GTKConvertMnemonics(label);
 
-#ifdef __WXGTK20__
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
         const char *stock = wxGetStockGtkID(m_windowId);
@@ -262,9 +249,6 @@ void wxButton::SetLabel( const wxString &lbl )
     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
 }
 
 bool wxButton::Enable( bool enable )
@@ -272,24 +256,20 @@ bool wxButton::Enable( bool enable )
     if ( !wxControl::Enable( enable ) )
         return FALSE;
 
-    gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 
     return TRUE;
 }
 
 bool wxButton::IsOwnGtkWindow( GdkWindow *window )
 {
-#ifdef __WXGTK20__
     return GTK_BUTTON(m_widget)->event_window;
-#else
-    return (window == m_widget->window);
-#endif
 }
 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -313,10 +293,6 @@ wxSize wxButton::DoGetBestSize() const
         GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     }
 
-#ifndef __WXGTK20__
-    ret.x += 10;  // add a few pixels for sloppy (but common) themes
-#endif
-
     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();