AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE. Surviving part of

Browse Source 
2005-08-08  Christian Persch  <chpe@cvs.gnome.org>

	* gtk/gtkmenutoolbutton.c:
	(gtk_menu_tool_button_construct_contents),
	(button_state_changed_cb), (menu_position_func),
	(arrow_button_toggled_cb):

	Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE.
	Surviving part of bug #310589.
This commit is contained in:
Christian Persch 2005-08-08 18:14:26 +00:00 committed by Christian Persch
parent d24e9eea16
commit 1992b31396
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-08-08 Christian Persch <chpe@cvs.gnome.org>
* gtk/gtkmenutoolbutton.c:
(gtk_menu_tool_button_construct_contents),
(button_state_changed_cb), (menu_position_func),
(arrow_button_toggled_cb):
Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE.
Surviving part of bug #310589.
2005-08-07 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk.symbols: Add the gdk_display variable.

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2005-08-08 Christian Persch <chpe@cvs.gnome.org>
* gtk/gtkmenutoolbutton.c:
(gtk_menu_tool_button_construct_contents),
(button_state_changed_cb), (menu_position_func),
(arrow_button_toggled_cb):
Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE.
Surviving part of bug #310589.
2005-08-07 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk.symbols: Add the gdk_display variable.

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
2005-08-08 Christian Persch <chpe@cvs.gnome.org>
* gtk/gtkmenutoolbutton.c:
(gtk_menu_tool_button_construct_contents),
(button_state_changed_cb), (menu_position_func),
(arrow_button_toggled_cb):
Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE.
Surviving part of bug #310589.
2005-08-07 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk.symbols: Add the gdk_display variable.

16
gtk/gtkmenutoolbutton.c
View File

@ -111,12 +111,10 @@ gtk_menu_tool_button_set_tooltip (GtkToolItem *tool_item,
static void
gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
{
GtkMenuToolButtonPrivate *priv;
GtkMenuToolButtonPrivate *priv = button->priv;
GtkWidget *box;
GtkOrientation orientation;
priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
orientation = gtk_tool_item_get_orientation (GTK_TOOL_ITEM (button));
if (orientation == GTK_ORIENTATION_HORIZONTAL)
@ -261,15 +259,13 @@ button_state_changed_cb (GtkWidget *widget,
GtkStateType previous_state,
GtkMenuToolButton *button)
{
GtkMenuToolButtonPrivate *priv;
GtkMenuToolButtonPrivate *priv = button->priv;
GtkWidget *other;
GtkStateType state = GTK_WIDGET_STATE (widget);
if (state == GTK_STATE_INSENSITIVE)
return;
priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
g_signal_handlers_block_by_func (other,
@ -307,14 +303,12 @@ menu_position_func (GtkMenu *menu,
gboolean *push_in,
GtkMenuToolButton *button)
{
GtkMenuToolButtonPrivate *priv;
GtkMenuToolButtonPrivate *priv = button->priv;
GtkRequisition req;
GtkRequisition menu_req;
GtkOrientation orientation;
GtkTextDirection direction;
priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
gdk_window_get_origin (GTK_BUTTON (priv->arrow_button)->event_window, x, y);
gtk_widget_size_request (priv->arrow_button, &req);
gtk_widget_size_request (GTK_WIDGET (priv->menu), &menu_req);
@ -366,9 +360,7 @@ static void
arrow_button_toggled_cb (GtkToggleButton *togglebutton,
GtkMenuToolButton *button)
{
GtkMenuToolButtonPrivate *priv;
priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
GtkMenuToolButtonPrivate *priv = button->priv;
if (!priv->menu)
return;