From 76e1ac5e08a2a3b06d766063a4bf1fa9be568788 Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 31 Jan 2011 04:13:53 +0000 Subject: [PATCH] Patch from bioman to fix an issue with static linking GTK and to correct the alignment of the fullscreen checkbox in the startup window when building with POLYMER=0 git-svn-id: https://svn.eduke32.com/eduke32@1785 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/startgtk.editor.c | 1 + polymer/eduke32/source/startgtk.game.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/polymer/eduke32/build/src/startgtk.editor.c b/polymer/eduke32/build/src/startgtk.editor.c index a41880453..7de019d23 100644 --- a/polymer/eduke32/build/src/startgtk.editor.c +++ b/polymer/eduke32/build/src/startgtk.editor.c @@ -1,6 +1,7 @@ #if defined(LINKED_GTK) #include #include +#include #else #include "dynamicgtk.h" #endif diff --git a/polymer/eduke32/source/startgtk.game.c b/polymer/eduke32/source/startgtk.game.c index 680e656ea..e90b9d71b 100644 --- a/polymer/eduke32/source/startgtk.game.c +++ b/polymer/eduke32/source/startgtk.game.c @@ -518,7 +518,11 @@ static GtkWidget *create_window(void) // 3D video mode LabelText stwidgets.vmode3dlabel = gtk_label_new_with_mnemonic("_Video mode:"); gtk_misc_set_alignment(GTK_MISC(stwidgets.vmode3dlabel), 0.3, 0); +#ifdef POLYMER gtk_table_attach(GTK_TABLE(stwidgets.configtlayout), stwidgets.vmode3dlabel, 0,1, 0,1, GTK_FILL, 0, 4, 0); +#else + gtk_table_attach(GTK_TABLE(stwidgets.configtlayout), stwidgets.vmode3dlabel, 0,1, 0,1, GTK_FILL, 0, 4, 7); +#endif // 3D video mode combo { @@ -536,7 +540,12 @@ static GtkWidget *create_window(void) // Fullscreen checkbox stwidgets.displayvlayout = gtk_vbox_new(TRUE, 0); +#ifdef POLYMER gtk_table_attach(GTK_TABLE(stwidgets.configtlayout), stwidgets.displayvlayout, 2,3, 0,1, GTK_FILL, 0, 4, 0); +#else + gtk_table_attach(GTK_TABLE(stwidgets.configtlayout), stwidgets.displayvlayout, 2,3, 0,1, GTK_FILL, 0, 4, 7); +#endif + stwidgets.fullscreencheck = gtk_check_button_new_with_mnemonic("_Fullscreen"); gtk_box_pack_start(GTK_BOX(stwidgets.displayvlayout), stwidgets.fullscreencheck, FALSE, FALSE, 0);