put toolbar in main_vbox, looks better

git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@531 d2ac09be-c843-0410-8b1f-f8a84130e0ec

xqf/ChangeLog

@@ -32,8 +32,8 @@ Oct 14, 2003: Ludwig Nussel <l-n@users.sourceforge.net>
 - wget uses XQF/version as user-agent now
 - for savage support, you need Steve Hartland's qstat from
   ftp://ftp.multiplay.co.uk/pub/apps/qstat/. Please note that the 'savage'
-  script of the savage demo is broken, you need to append "$@" in line five if
-  you want to join any game.
+  script of the savage demo is broken, you need to put "$@" after savage.bin in
+  line five if you want to join any game.
 - show g_gametypestring for Medal of Honor
 - increase version number to make new masters show up
 

xqf/src/pixmaps.c

@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+#include "gnuconfig.h"
+
 #include <gtk/gtk.h>
 
 #include "utils.h"

xqf/src/xqf.c

@@ -3415,12 +3415,14 @@ void create_main_window (void) {
   main_toolbar = gtk_toolbar_new ();
   gtk_toolbar_set_orientation (GTK_TOOLBAR(main_toolbar),GTK_ORIENTATION_HORIZONTAL);
   gtk_toolbar_set_style (GTK_TOOLBAR(main_toolbar),GTK_TOOLBAR_BOTH);
+  gtk_box_pack_start (GTK_BOX (main_vbox), main_toolbar, FALSE, FALSE, 0);
+  // FIXME
+  gtk_box_reorder_child(GTK_BOX (main_vbox), main_toolbar, 2);
 #else
   main_toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, 
                                                             GTK_TOOLBAR_BOTH);
-#endif
-
   gtk_box_pack_start (GTK_BOX (vbox), main_toolbar, FALSE, FALSE, 0);
+#endif
   populate_main_toolbar ();
   gtk_widget_show (main_toolbar);