projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug reporting the significance of paired value t-test.
[pspp-builds.git]
/
src
/
ui
/
gui
/
main.c
diff --git
a/src/ui/gui/main.c
b/src/ui/gui/main.c
index 4fc21595bedd3c442b8394aec1fa922ab5b15707..eca3f98f6866d9ddeb1a44133914c427f4bfad14 100644
(file)
--- a/
src/ui/gui/main.c
+++ b/
src/ui/gui/main.c
@@
-14,11
+14,13
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include <config.h>
#include <gtk/gtk.h>
#include "psppire.h"
#include "progname.h"
#include <stdlib.h>
#include <getopt.h>
#include <gtk/gtk.h>
#include "psppire.h"
#include "progname.h"
#include <stdlib.h>
#include <getopt.h>
+#include <gl/relocatable.h>
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
@@
-41,7
+43,10
@@
create_splash_window (void)
gtk_window_set_position (GTK_WINDOW (splash),
GTK_WIN_POS_CENTER_ALWAYS);
gtk_window_set_position (GTK_WINDOW (splash),
GTK_WIN_POS_CENTER_ALWAYS);
- image = gtk_image_new_from_file (PKGDATADIR "/splash.png");
+ gtk_window_set_type_hint (GTK_WINDOW (splash),
+ GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+
+ image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png"));
gtk_container_add (GTK_CONTAINER (splash), image);
gtk_container_add (GTK_CONTAINER (splash), image);
@@
-54,7
+59,7
@@
static gboolean
hide_splash_window (gpointer data)
{
GtkWidget *splash = data;
hide_splash_window (gpointer data)
{
GtkWidget *splash = data;
- gtk_widget_
hide
(splash);
+ gtk_widget_
destroy
(splash);
gtk_window_set_auto_startup_notification (TRUE);
return FALSE;
}
gtk_window_set_auto_startup_notification (TRUE);
return FALSE;
}
@@
-91,7
+96,7
@@
main (int argc, char *argv[])
gchar *filename = 0;
gboolean show_splash = TRUE;
GError *err = 0;
gchar *filename = 0;
gboolean show_splash = TRUE;
GError *err = 0;
- gchar *vers;
+
const
gchar *vers;
set_program_name (argv[0]);
set_program_name (argv[0]);
@@
-121,7
+126,7
@@
main (int argc, char *argv[])
if ( show_splash )
gtk_widget_show (splash_window);
if ( show_splash )
gtk_widget_show (splash_window);
- g
tk
_idle_add (quit_one_loop, 0);
+ g_idle_add (quit_one_loop, 0);
gtk_quit_add (0, run_inner_loop, splash_window);
gtk_main ();
gtk_quit_add (0, run_inner_loop, splash_window);
gtk_main ();