summaryrefslogtreecommitdiff
path: root/pluma/pluma-notebook.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-19 14:08:24 +0200
committerinfirit <[email protected]>2014-05-19 18:37:37 +0200
commit53be5f994d2c52142debdfdaf089ae077389cfbd (patch)
tree0fa3d45109140a79eccc2533daa39df3c33c1d50 /pluma/pluma-notebook.c
parentb3097ad42becf1943377a07919d7b9598386c13d (diff)
downloadpluma-53be5f994d2c52142debdfdaf089ae077389cfbd.tar.bz2
pluma-53be5f994d2c52142debdfdaf089ae077389cfbd.tar.xz
Replace GtkObject with Gobject in gtk+2 build
Diffstat (limited to 'pluma/pluma-notebook.c')
-rw-r--r--pluma/pluma-notebook.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/pluma/pluma-notebook.c b/pluma/pluma-notebook.c
index c792f4bb..8842cf02 100644
--- a/pluma/pluma-notebook.c
+++ b/pluma/pluma-notebook.c
@@ -100,11 +100,7 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
pluma_notebook_dispose (GObject *object)
-#else
-pluma_notebook_destroy (GtkObject *object)
-#endif
{
PlumaNotebook *notebook = PLUMA_NOTEBOOK (object);
@@ -124,28 +120,17 @@ pluma_notebook_destroy (GtkObject *object)
notebook->priv->destroy_has_run = TRUE;
}
-#if GTK_CHECK_VERSION (3, 0, 0)
G_OBJECT_CLASS (pluma_notebook_parent_class)->dispose (object);
-#else
- GTK_OBJECT_CLASS (pluma_notebook_parent_class)->destroy (object);
-#endif
}
static void
pluma_notebook_class_init (PlumaNotebookClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
-#endif
GtkNotebookClass *notebook_class = GTK_NOTEBOOK_CLASS (klass);
object_class->finalize = pluma_notebook_finalize;
-#if GTK_CHECK_VERSION (3, 0, 0)
object_class->dispose = pluma_notebook_dispose;
-#else
- gtkobject_class->destroy = pluma_notebook_destroy;
-#endif
notebook_class->change_current_page = pluma_notebook_change_current_page;
@@ -261,13 +246,6 @@ find_tab_num_at_pos (PlumaNotebook *notebook,
tab_pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (notebook));
-#if !GTK_CHECK_VERSION (3, 0, 0)
- if (GTK_NOTEBOOK (notebook)->first_tab == NULL)
- {
- return AFTER_ALL_TABS;
- }
-#endif
-
/* For some reason unfullscreen + quick click can
cause a wrong click event to be reported to the tab */
if (!is_in_notebook_window (notebook, abs_x, abs_y))
@@ -689,11 +667,7 @@ pluma_notebook_new (void)
static void
pluma_notebook_switch_page_cb (GtkNotebook *notebook,
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkWidget *page,
-#else
- GtkNotebookPage *page,
-#endif
guint page_num,
gpointer data)
{