disable gtktheme compilation

[xonotic/netradiant.git] / radiant / main.cpp

diff --git a/radiant/main.cpp b/radiant/main.cpp
index fec9894d9d13004ba07d508d958475ba52b82223..88cd0cad4fd89e7a774ca8941be1a9fbd5b60144 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -534,6 +534,31 @@ void user_shortcuts_save(){
        SaveCommandMap( path.c_str() );
 }
 
+void add_local_rc_files(){
+#define GARUX_DISABLE_GTKTHEME
+#ifndef GARUX_DISABLE_GTKTHEME
+/* FIXME: HACK: not GTK3 compatible
+ https://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html#gtk-rc-add-default-file
+ https://developer.gnome.org/gtk3/stable/gtk3-Resource-Files.html#gtk-rc-add-default-file
+ > gtk_rc_add_default_file has been deprecated since version 3.0 and should not be used in newly-written code.
+ > Use GtkStyleContext with a custom GtkStyleProvider instead
+*/
+
+       {
+               StringOutputStream path( 512 );
+               path << AppPath_get() << ".gtkrc-2.0.radiant";
+               gtk_rc_add_default_file( path.c_str() );
+       }
+#ifdef WIN32
+       {
+               StringOutputStream path( 512 );
+               path << AppPath_get() << ".gtkrc-2.0.win";
+               gtk_rc_add_default_file( path.c_str() );
+       }
+#endif
+#endif // GARUX_DISABLE_GTKTHEME
+}
+
 int main( int argc, char* argv[] ){
        crt_init();
 
@@ -609,6 +634,8 @@ int main( int argc, char* argv[] ){
 
        paths_init();
 
+       add_local_rc_files();
+
        if ( !check_version() ) {
                return EXIT_FAILURE;
        }
@@ -649,7 +676,7 @@ int main( int argc, char* argv[] ){
        hide_splash();
 
 #ifdef WIN32
-       if( openCmdMap[0] != '\0' ){
+       if( openCmdMap && *openCmdMap ){
                Map_LoadFile( openCmdMap );
        }
        else