Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't modify position for default border if button is in a native widget

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-10 20:45:06 +00:00
parent 205177b0b4
commit 4cdf71be82
1 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtk/button.cpp
View File

@@ -20,12 +20,6 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxButton;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// data // data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -52,35 +46,27 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
// "style_set" from m_widget // "style_set" from m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint extern "C" {
gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win ) static void
gtk_button_style_set_callback(GtkWidget* widget, GtkStyle*, wxButton* win)
{ {
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_CAN_DEFAULT(widget))
{ {
GtkBorder *default_border = NULL; GtkBorder* border = NULL;
gtk_widget_style_get( m_widget, "default_border", &default_border, NULL ); gtk_widget_style_get(widget, "default_border", &border, NULL);
if (default_border) if (border)
{ {
left_border += default_border->left;
right_border += default_border->right;
top_border += default_border->top;
bottom_border += default_border->bottom;
gtk_border_free( default_border );
}
win->MoveWindow( win->MoveWindow(
win->m_x - left_border, win->m_x - border->left,
win->m_y - top_border, win->m_y - border->top,
win->m_width + left_border + right_border, win->m_width + border->left + border->right,
win->m_height + top_border + bottom_border); win->m_height + border->top + border->bottom);
gtk_border_free(border);
}
}
} }
return FALSE;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -209,8 +195,6 @@ void wxButton::SetLabel( const wxString &lbl )
wxControl::SetLabel(label); wxControl::SetLabel(label);
const wxString labelGTK = GTKConvertMnemonics(label);
if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
{ {
const char *stock = wxGetStockGtkID(m_windowId); const char *stock = wxGetStockGtkID(m_windowId);
@@ -222,6 +206,7 @@ void wxButton::SetLabel( const wxString &lbl )
} }
} }
const wxString labelGTK = GTKConvertMnemonics(label);
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);