Author: cazfi
Date: Thu Nov 12 23:09:53 2015
New Revision: 30581
URL: http://svn.gna.org/viewcvs/freeciv?rev=30581&view=rev
Log:
Converted last of the gui_options.gui_gtk3_ accesses to use wrapper macros
See patch #6566
Modified:
trunk/client/gui-gtk-3.0/gui_main.c
trunk/client/gui-gtk-3.0/gui_main.h
trunk/client/gui-gtk-3.0/themes.c
Modified: trunk/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=30581&r1=30580&r2=30581&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Thu Nov 12 23:09:53 2015
@@ -1439,7 +1439,7 @@
}
gtk_container_add(GTK_CONTAINER(avbox), vgrid);
- if (gui_options.gui_gtk3_small_display_layout) {
+ if (GUI_GTK_OPTION(small_display_layout)) {
hpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
} else {
hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
Modified: trunk/client/gui-gtk-3.0/gui_main.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.h?rev=30581&r1=30580&r2=30581&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.h (original)
+++ trunk/client/gui-gtk-3.0/gui_main.h Thu Nov 12 23:09:53 2015
@@ -23,6 +23,7 @@
#define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_##optname
#define GUI_GTK_OPTION_STR(optname) "gui_gtk3_" #optname
+#define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_DEFAULT_THEME_NAME
/* network string charset conversion */
gchar *ntoh_str(const gchar *netstr);
Modified: trunk/client/gui-gtk-3.0/themes.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/themes.c?rev=30581&r1=30580&r2=30581&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/themes.c (original)
+++ trunk/client/gui-gtk-3.0/themes.c Thu Nov 12 23:09:53 2015
@@ -65,16 +65,16 @@
bool theme_loaded;
/* try to load user defined theme */
- theme_loaded = load_theme(gui_options.gui_gtk3_default_theme_name);
+ theme_loaded = load_theme(GUI_GTK_OPTION(default_theme_name));
/* no user defined theme loaded -> try to load Freeciv default theme */
if (!theme_loaded) {
- theme_loaded = load_theme(FC_GTK3_DEFAULT_THEME_NAME);
+ theme_loaded = load_theme(GUI_GTK_DEFAULT_THEME_NAME);
if (theme_loaded) {
- sz_strlcpy(gui_options.gui_gtk3_default_theme_name,
FC_GTK3_DEFAULT_THEME_NAME);
+ sz_strlcpy(GUI_GTK_OPTION(default_theme_name),
GUI_GTK_DEFAULT_THEME_NAME);
}
}
-
+
/* still no theme loaded -> load system default theme */
if (!theme_loaded) {
gtk_style_context_add_provider_for_screen(
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
