X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..9419b0d64948485ab83122484ffe4b7dcde25905:/src/gtk1/button.cpp

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index ca57fcc514..e12cd26f15 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -17,8 +17,8 @@
 #include "wx/button.h"
 #include "wx/stockitem.h"
 
-#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/private.h"
+#include "wx/gtk1/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -76,23 +76,10 @@ 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)
-        {
-            left_border += default_border->left;
-            right_border += default_border->right;
-            top_border += default_border->top;
-            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,
@@ -130,11 +117,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))
@@ -148,18 +131,9 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     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)),
+    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
                                 x_alignment, y_alignment);
-    }
 
     SetLabel(label);
 
@@ -197,40 +171,7 @@ void wxButton::SetDefault()
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
-#ifdef __WXGTK20__
-    static wxSize size = wxDefaultSize;
-    if (size == wxDefaultSize)
-    {
-        // NB: Default size of buttons should be same as size of stock
-        //     buttons as used in most GTK+ apps. Unfortunately it's a little
-        //     tricky to obtain this size: stock button's size may be smaller
-        //     than size of button in GtkButtonBox and vice versa,
-        //     GtkButtonBox's minimal button size may be smaller than stock
-        //     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 *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);
-
-        gint minwidth, minheight;
-        gtk_widget_style_get(box,
-                             "child-min-width", &minwidth,
-                             "child-min-height", &minheight,
-                             NULL);
-
-        size.x = wxMax(minwidth, req.width);
-        size.y = wxMax(minheight, req.height);
-
-        gtk_widget_destroy(wnd);
-    }
-    return size;
-#else
     return wxSize(80,26);
-#endif
 }
 
 void wxButton::SetLabel( const wxString &lbl )
@@ -244,27 +185,9 @@ void wxButton::SetLabel( const wxString &lbl )
 
     wxControl::SetLabel(label);
 
-    const wxString labelGTK = GTKConvertMnemonics(label);
-
-#ifdef __WXGTK20__
-    if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
-    {
-        const char *stock = wxGetStockGtkID(m_windowId);
-        if (stock)
-        {
-            gtk_button_set_label(GTK_BUTTON(m_widget), stock);
-            gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE);
-            return;
-        }
-    }
-
-    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
-    gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
+    const wxString labelGTK = GTKRemoveMnemonics(label);
 
-    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 )
@@ -279,11 +202,7 @@ bool wxButton::Enable( bool enable )
 
 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)
@@ -313,9 +232,7 @@ 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))
     {