Use ->priv instead of GTK_MENU_TOOL_BUTTON_GET_PRIVATE. Surviving part of

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.

diff --git a/ChangeLog b/ChangeLog
index f52c2e394edcbb9fa76983412667191b16188e82..3068e9854d9cef0cf95b9b3ea06f09f23c4e18d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f52c2e394edcbb9fa76983412667191b16188e82..3068e9854d9cef0cf95b9b3ea06f09f23c4e18d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f52c2e394edcbb9fa76983412667191b16188e82..3068e9854d9cef0cf95b9b3ea06f09f23c4e18d2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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.

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 713aa3f8844a5b563c70fb4162a82fa2d0d65cfa..039aadef4662004b6c126feee0fbb4637878fc1d 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -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;