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

Convert to use instance private data.

Browse Source 
2006-01-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpaned.c: Convert to use instance private data.
This commit is contained in:
Matthias Clasen
2006-01-10 17:56:27 +00:00
committed by Matthias Clasen
parent 65c8f103d6
commit 0278fb06f7
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpaned.c: Convert to use instance private data.
2006-01-10 Michael Natterer <mitch@imendio.com> 2006-01-10 Michael Natterer <mitch@imendio.com>
* gdk/gdkpango.c (on_renderer_display_closed): disconnect from the * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
2006-01-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpaned.c: Convert to use instance private data.
2006-01-10 Michael Natterer <mitch@imendio.com> 2006-01-10 Michael Natterer <mitch@imendio.com>
* gdk/gdkpango.c (on_renderer_display_closed): disconnect from the * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the

10
gtk/gtkpaned.c
View File

@ -138,8 +138,8 @@ static GtkContainerClass *parent_class = NULL;
struct _GtkPanedPrivate struct _GtkPanedPrivate
{ {
GtkWidget *saved_focus; GtkWidget *saved_focus;
GtkPaned *first_paned; GtkPaned *first_paned;
guint32 grab_time; guint32 grab_time;
}; };
GType GType
@ -467,6 +467,8 @@ gtk_paned_class_init (GtkPanedClass *class)
add_move_binding (binding_set, GDK_KP_Home, 0, GTK_SCROLL_START); add_move_binding (binding_set, GDK_KP_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_End, 0, GTK_SCROLL_END); add_move_binding (binding_set, GDK_End, 0, GTK_SCROLL_END);
add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END); add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END);
g_type_class_add_private (object_class, sizeof (GtkPanedPrivate));
} }
static GType static GType
@ -495,7 +497,7 @@ gtk_paned_init (GtkPaned *paned)
paned->last_allocation = -1; paned->last_allocation = -1;
paned->in_drag = FALSE; paned->in_drag = FALSE;
paned->priv = g_new0 (GtkPanedPrivate, 1); paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, GTK_TYPE_PANED, GtkPanedPrivate);
paned->last_child1_focus = NULL; paned->last_child1_focus = NULL;
paned->last_child2_focus = NULL; paned->last_child2_focus = NULL;
paned->in_recursion = FALSE; paned->in_recursion = FALSE;
@ -646,8 +648,6 @@ gtk_paned_finalize (GObject *object)
gtk_paned_set_saved_focus (paned, NULL); gtk_paned_set_saved_focus (paned, NULL);
gtk_paned_set_first_paned (paned, NULL); gtk_paned_set_first_paned (paned, NULL);
g_free (paned->priv);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }