mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2024-11-10 06:31:41 +00:00
Remove unused variable. Fix char cast. Finish conditionalizing of splash_screen. Addresses all of the compiler warnings for main.cpp.
This commit is contained in:
parent
576823a4e3
commit
c8fb5b9b5b
1 changed files with 3 additions and 3 deletions
|
@ -92,6 +92,7 @@ gint try_destroy_splash( gpointer data ){
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef SKIP_SPLASH
|
||||||
static void create_splash() {
|
static void create_splash() {
|
||||||
splash_screen = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
splash_screen = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
gtk_window_set_title(GTK_WINDOW(splash_screen), "Splash Screen");
|
gtk_window_set_title(GTK_WINDOW(splash_screen), "Splash Screen");
|
||||||
|
@ -111,6 +112,7 @@ static void create_splash() {
|
||||||
while(gtk_events_pending())
|
while(gtk_events_pending())
|
||||||
gtk_main_iteration();
|
gtk_main_iteration();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// Loki stuff
|
// Loki stuff
|
||||||
|
@ -413,10 +415,8 @@ void error_redirect( const gchar *domain, GLogLevelFlags log_level, const gchar
|
||||||
|
|
||||||
int main( int argc, char* argv[] ) {
|
int main( int argc, char* argv[] ) {
|
||||||
const char *libgl;
|
const char *libgl;
|
||||||
char *ptr;
|
|
||||||
int i, j, k;
|
int i, j, k;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Rambetter on Sat Nov 13, 2010:
|
Rambetter on Sat Nov 13, 2010:
|
||||||
|
|
||||||
|
@ -461,7 +461,7 @@ int main( int argc, char* argv[] ) {
|
||||||
_after_ gtk_init(), I chose to fix this problem via environment variable. I think it's cleaner
|
_after_ gtk_init(), I chose to fix this problem via environment variable. I think it's cleaner
|
||||||
that way.
|
that way.
|
||||||
*/
|
*/
|
||||||
putenv( "LC_NUMERIC=C" );
|
putenv( (char *)"LC_NUMERIC=C" );
|
||||||
|
|
||||||
// Use the same environment variable for resolving libGL as libgtkglext does.
|
// Use the same environment variable for resolving libGL as libgtkglext does.
|
||||||
libgl = getenv("GDK_GL_LIBGL_PATH");
|
libgl = getenv("GDK_GL_LIBGL_PATH");
|
||||||
|
|
Loading…
Reference in a new issue