From 6162b7343d60f96439c31519304b4afa9395573a Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Sun, 7 Apr 2013 14:56:16 +0200 Subject: [PATCH] Fixed compiler erro with gtk3. Fixed none shown inputbox and statusbar if compiled against gtk3. --- src/main.c | 5 ++++- src/main.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 5139bd8..d449404 100644 --- a/src/main.c +++ b/src/main.c @@ -615,7 +615,10 @@ static void init_core(void) gui->scroll = gtk_scrolled_window_new(NULL, NULL); gui->adjust_h = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(gui->scroll)); gui->adjust_v = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(gui->scroll)); + +#ifndef HAS_GTK3 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gui->scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER); +#endif /* Prepare the inputbox */ gui->inputbox = gtk_entry_new(); @@ -638,6 +641,7 @@ static void init_core(void) gui->eventbox = gtk_event_box_new(); gtk_paned_pack1(GTK_PANED(gui->pane), GTK_WIDGET(gui->box), TRUE, TRUE); + gtk_widget_show_all(gui->window); setup_signals(); @@ -668,7 +672,6 @@ static void init_core(void) /* initially apply input style */ vb_update_input_style(); - /* make sure the main window and all its contents are visible */ gtk_widget_show_all(gui->window); } diff --git a/src/main.h b/src/main.h index fe0680a..c4e0bcb 100644 --- a/src/main.h +++ b/src/main.h @@ -316,8 +316,8 @@ typedef struct { Window embed; #else GdkNativeWindow embed; - char *custom_config; #endif + char *custom_config; } VbCore; /* main object */ -- 2.20.1