X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..f31bbefd1070af6162b9deeda9d4e528efbc1b31:/src/gtk/button.cpp diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index ce4f0ab373..61e1ad1396 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -71,11 +71,11 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w right_border += default_border->right; top_border += default_border->top; bottom_border += default_border->bottom; - g_free( default_border ); + gtk_border_free( default_border ); } win->MoveWindow( - win->m_x - top_border, - win->m_y - left_border, + win->m_x - left_border, + win->m_y - top_border, win->m_width + left_border + right_border, win->m_height + top_border + bottom_border); } @@ -97,12 +97,15 @@ 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 ) +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; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) {