projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed horizontal scrolling for header window (variable names)
[pspp]
/
src
/
ui
/
gui
/
main.c
diff --git
a/src/ui/gui/main.c
b/src/ui/gui/main.c
index 6bd6d1b9048085e47d7b09c6a1ba6966ba6f5522..1e59f8431fc5fa8783ca3c910180001b69e08a08 100644
(file)
--- a/
src/ui/gui/main.c
+++ b/
src/ui/gui/main.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013
, 2014
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-88,7
+88,7
@@
usage (void)
gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base;
printf (_("\
gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base;
printf (_("\
-PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n\
+PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample
d
data.\n\
Usage: %s [OPTION]... FILE\n\
\n\
Arguments to long options also apply to equivalent short options.\n\
Usage: %s [OPTION]... FILE\n\
\n\
Arguments to long options also apply to equivalent short options.\n\
@@
-199,12
+199,14
@@
print_startup_time (gpointer data)
return FALSE;
}
return FALSE;
}
+/*
static gboolean
quit_one_loop (gpointer data)
{
gtk_main_quit ();
return FALSE;
}
static gboolean
quit_one_loop (gpointer data)
{
gtk_main_quit ();
return FALSE;
}
+*/
struct initialisation_parameters
{
struct initialisation_parameters
{
@@
-287,7
+289,12
@@
main (int argc, char *argv[])
set_program_name (argv[0]);
g_mem_set_vtable (&vtable);
set_program_name (argv[0]);
g_mem_set_vtable (&vtable);
+
+#if !GLIB_CHECK_VERSION(2,32,0)
+ /* g_thread_init() was required before glib 2.32, but it is deprecated since
+ then and calling it yields a compile-time warning. */
g_thread_init (NULL);
g_thread_init (NULL);
+#endif
gtk_disable_setlocale ();
gtk_disable_setlocale ();
@@
-329,13
+336,14
@@
main (int argc, char *argv[])
init_p.splash_window = create_splash_window ();
init_p.data_file = optind < argc ? argv[optind] : NULL;
init_p.splash_window = create_splash_window ();
init_p.data_file = optind < argc ? argv[optind] : NULL;
- if ( show_splash )
- gtk_widget_show (init_p.splash_window);
+
//
if ( show_splash )
+
//
gtk_widget_show (init_p.splash_window);
- g_idle_add (quit_one_loop, 0);
+
//
g_idle_add (quit_one_loop, 0);
- gtk_quit_add (0, run_inner_loop, &init_p);
- gtk_main ();
+ // gtk_quit_add (0, run_inner_loop, &init_p);
+ run_inner_loop (&init_p);
+ // gtk_main ();
return 0;
}
return 0;
}