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
This commit is contained in:
terminx 2011-01-31 04:13:53 +00:00
parent e24a1058f5
commit 76e1ac5e08
2 changed files with 10 additions and 0 deletions

View file

@ -1,6 +1,7 @@
#if defined(LINKED_GTK)
#include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gdk/gdkkeysyms.h>
#else
#include "dynamicgtk.h"
#endif

View file

@ -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);