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

remove strange #define fix cut'n'paste error use instance private data use

Browse Source 
Tue Jul  8 21:35:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoggletoolbutton.h: remove strange #define
	* gtk/gtktoolbutton.h: fix cut'n'paste error
	* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
	private data
	* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
	private data instead of g_new0()
	* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
	instance private data
This commit is contained in:
Soeren Sandmann
2003-07-08 20:28:24 +00:00
committed by Søren Sandmann Pedersen
parent 81785924f9
commit d523e1a2b1
10 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Tue Jul 8 21:35:22 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoggletoolbutton.h: remove strange #define
* gtk/gtktoolbutton.h: fix cut'n'paste error
* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
private data
* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
private data instead of g_new0()
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
instance private data
Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK * gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Tue Jul 8 21:35:22 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoggletoolbutton.h: remove strange #define
* gtk/gtktoolbutton.h: fix cut'n'paste error
* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
private data
* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
private data instead of g_new0()
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
instance private data
Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK * gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Tue Jul 8 21:35:22 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoggletoolbutton.h: remove strange #define
* gtk/gtktoolbutton.h: fix cut'n'paste error
* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
private data
* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
private data instead of g_new0()
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
instance private data
Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK * gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Tue Jul 8 21:35:22 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoggletoolbutton.h: remove strange #define
* gtk/gtktoolbutton.h: fix cut'n'paste error
* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
private data
* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
private data instead of g_new0()
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
instance private data
Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK * gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Tue Jul 8 21:35:22 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoggletoolbutton.h: remove strange #define
* gtk/gtktoolbutton.h: fix cut'n'paste error
* gtk/gtktoolbutton.c (gtk_tool_button_init): use instance
private data
* gtk/gtktoolitem.c (gtk_tool_item_class_init): use instance
private data instead of g_new0()
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_init): use
instance private data
Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jul 8 21:10:14 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK * gtk/gtkbutton.c (gtk_button_realize): remove GDK_EXPOSURE_MASK

4
gtk/gtktoggletoolbutton.c
View File

@ -102,12 +102,14 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass)
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
g_type_class_add_private (object_class, sizeof (GtkToggleToolButtonPrivate));
} }
static void static void
gtk_toggle_tool_button_init (GtkToggleToolButton *button) gtk_toggle_tool_button_init (GtkToggleToolButton *button)
{ {
button->priv = g_new0 (GtkToggleToolButtonPrivate, 1); button->priv = GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE (button);
g_signal_connect_object (_gtk_tool_button_get_button (GTK_TOOL_BUTTON (button)), g_signal_connect_object (_gtk_tool_button_get_button (GTK_TOOL_BUTTON (button)),
"toggled", G_CALLBACK (button_toggled), button, 0); "toggled", G_CALLBACK (button_toggled), button, 0);

3
gtk/gtktoggletoolbutton.h
View File

@ -33,8 +33,7 @@ G_BEGIN_DECLS
#define GTK_IS_TOGGLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON)) #define GTK_IS_TOGGLE_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON)) #define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
#define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass)) #define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
#define GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOOL_BUTTON, GtkToggleToolButtonPrivate)) #define GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonPrivate))
#define GTK_TOGGLE_TOOL_BUTTON_GET_PRIVATE(obj) (
typedef struct _GtkToggleToolButton GtkToggleToolButton; typedef struct _GtkToggleToolButton GtkToggleToolButton;
typedef struct _GtkToggleToolButtonClass GtkToggleToolButtonClass; typedef struct _GtkToggleToolButtonClass GtkToggleToolButtonClass;

4
gtk/gtktoolbutton.c
View File

@ -217,6 +217,8 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
g_type_class_add_private (object_class, sizeof (GtkToolButtonPrivate));
} }
static void static void
@ -225,7 +227,7 @@ gtk_tool_button_init (GtkToolButton *button,
{ {
GtkToolItem *toolitem = GTK_TOOL_ITEM (button); GtkToolItem *toolitem = GTK_TOOL_ITEM (button);
button->priv = g_new0 (GtkToolButtonPrivate, 1); button->priv = GTK_TOOL_BUTTON_GET_PRIVATE (button);
gtk_tool_item_set_homogeneous (toolitem, TRUE); gtk_tool_item_set_homogeneous (toolitem, TRUE);

2
gtk/gtktoolbutton.h
View File

@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define GTK_IS_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON)) #define GTK_IS_TOOL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOOL_BUTTON)) #define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
#define GTK_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass)) #define GTK_TOOL_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
#define GTK_TOOL_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonPrivate)) #define GTK_TOOL_BUTTON_GET_PRIVATE(obj)(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonPrivate))
typedef struct _GtkToolButton GtkToolButton; typedef struct _GtkToolButton GtkToolButton;
typedef struct _GtkToolButtonClass GtkToolButtonClass; typedef struct _GtkToolButtonClass GtkToolButtonClass;

7
gtk/gtktoolitem.c
View File

@ -190,10 +190,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING); G_TYPE_STRING);
/* FIXME: enable this when bug 116921 is fixed */
#if 0
g_type_class_add_private (object_class, sizeof (GtkToolItemPrivate)); g_type_class_add_private (object_class, sizeof (GtkToolItemPrivate));
#endif
} }
static void static void
@ -201,11 +198,7 @@ gtk_tool_item_init (GtkToolItem *toolitem)
{ {
GTK_WIDGET_UNSET_FLAGS (toolitem, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS (toolitem, GTK_CAN_FOCUS);
/* FIXME: enable this when bug 116921 is fixed */
#if 0
toolitem->priv = GTK_TOOL_ITEM_GET_PRIVATE (toolitem); toolitem->priv = GTK_TOOL_ITEM_GET_PRIVATE (toolitem);
#endif
toolitem->priv = g_new0 (GtkToolItemPrivate, 1);
toolitem->priv->visible_horizontal = TRUE; toolitem->priv->visible_horizontal = TRUE;
toolitem->priv->visible_vertical = TRUE; toolitem->priv->visible_vertical = TRUE;