terminal-screen-container: avoid 'g_type_class_add_private'

Pablo Barciela 2019-08-26 18:57:12 +02:00 committed by lukefromdc
parent cd3ff31b7e
commit 3745b0e978
1 changed files with 2 additions and 6 deletions

View File

@ -25,8 +25,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#define TERMINAL_SCREEN_CONTAINER_GET_PRIVATE(screen_container)(G_TYPE_INSTANCE_GET_PRIVATE ((screen_container), TERMINAL_TYPE_SCREEN_CONTAINER, TerminalScreenContainerPrivate))
struct _TerminalScreenContainerPrivate struct _TerminalScreenContainerPrivate
{ {
TerminalScreen *screen; TerminalScreen *screen;
@ -52,7 +50,7 @@ enum
PROP_WINDOW_PLACEMENT_SET PROP_WINDOW_PLACEMENT_SET
}; };
G_DEFINE_TYPE (TerminalScreenContainer, terminal_screen_container, GTK_TYPE_BOX) G_DEFINE_TYPE_WITH_PRIVATE (TerminalScreenContainer, terminal_screen_container, GTK_TYPE_BOX)
/* helper functions */ /* helper functions */
@ -117,7 +115,7 @@ terminal_screen_container_init (TerminalScreenContainer *container)
{ {
TerminalScreenContainerPrivate *priv; TerminalScreenContainerPrivate *priv;
priv = container->priv = TERMINAL_SCREEN_CONTAINER_GET_PRIVATE (container); priv = container->priv = terminal_screen_container_get_instance_private (container);
priv->hscrollbar_policy = GTK_POLICY_AUTOMATIC; priv->hscrollbar_policy = GTK_POLICY_AUTOMATIC;
priv->vscrollbar_policy = GTK_POLICY_AUTOMATIC; priv->vscrollbar_policy = GTK_POLICY_AUTOMATIC;
@ -251,8 +249,6 @@ terminal_screen_container_class_init (TerminalScreenContainerClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (gobject_class, sizeof (TerminalScreenContainerPrivate));
gobject_class->constructor = terminal_screen_container_constructor; gobject_class->constructor = terminal_screen_container_constructor;
gobject_class->get_property = terminal_screen_container_get_property; gobject_class->get_property = terminal_screen_container_get_property;
gobject_class->set_property = terminal_screen_container_set_property; gobject_class->set_property = terminal_screen_container_set_property;