callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export privately. Adjust all callers.

Browse Source 
2006-08-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentryprivate.h:
	* gtk/gtkentry.c (_gtk_entry_effective_inner_border): Export
	privately. Adjust all callers.

	* gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use it
	here to get the actual inner border.  (#349429, Benjamin Berg)
This commit is contained in:
Matthias Clasen
2006-08-15 18:52:14 +00:00
committed by Matthias Clasen
parent 52398c8354
commit 83e9b96337
6 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkspinbutton.c
View File

@ -36,6 +36,7 @@
#include "gdk/gdkkeysyms.h"
#include "gtkbindings.h"
#include "gtkspinbutton.h"
#include "gtkentryprivate.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtksettings.h"
@ -624,6 +625,7 @@ gtk_spin_button_size_request (GtkWidget *widget,
gboolean interior_focus;
gint focus_width;
gint xborder, yborder;
GtkBorder inner_border;
gtk_widget_style_get (widget,
"interior-focus", &interior_focus,
@ -657,10 +659,9 @@ gtk_spin_button_size_request (GtkWidget *widget,
width = MAX (width, w);
_gtk_entry_get_borders (entry, &xborder, &yborder);
xborder += 2; /* INNER_BORDER */
_gtk_entry_effective_inner_border (entry, &inner_border);
requisition->width = width + xborder * 2;
requisition->width = width + xborder * 2 + inner_border.left + inner_border.right;
}
requisition->width += arrow_size + 2 * widget->style->xthickness;