From: Daniel Carl Date: Mon, 4 Feb 2013 19:28:20 +0000 (+0100) Subject: Fixed none working function with GTK3. X-Git-Url: https://git.owens.tech/dummy.html/dummy.html/git?a=commitdiff_plain;h=45ddc0e6edf48ec1bc34dac06607801a1025d745;p=vimb.git Fixed none working function with GTK3. --- diff --git a/src/main.c b/src/main.c index c7d897c..7f32475 100644 --- a/src/main.c +++ b/src/main.c @@ -662,9 +662,11 @@ static void vp_init_gui(void) g_object_set(gtk_widget_get_settings(gui->inputbox), "gtk-entry-select-on-focus", FALSE, NULL); #ifdef HAS_GTK3 + gui->pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL); gui->box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0)); gui->statusbar.box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0)); #else + gui->pane = gtk_vpaned_new(); gui->box = GTK_BOX(gtk_vbox_new(FALSE, 0)); gui->statusbar.box = GTK_BOX(gtk_hbox_new(FALSE, 0)); #endif @@ -674,7 +676,6 @@ static void vp_init_gui(void) /* Prepare the event box */ gui->eventbox = gtk_event_box_new(); - gui->pane = gtk_vpaned_new(); gtk_paned_pack1(GTK_PANED(gui->pane), GTK_WIDGET(gui->box), TRUE, TRUE); vp_setup_signals(); diff --git a/src/main.h b/src/main.h index 240204a..4123126 100644 --- a/src/main.h +++ b/src/main.h @@ -23,6 +23,11 @@ #include #include #include +#ifdef HAS_GTK3 +#include +#include +#else +#endif #define LENGTH(x) (sizeof x / sizeof x[0]) @@ -205,7 +210,11 @@ typedef struct { Mode mode; gchar modkey; guint count; +#ifdef HAS_GTK3 + Window embed; +#else GdkNativeWindow embed; +#endif guint progress; StatusType status; gboolean is_inspecting;