Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3164 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Dec 13, 2004, 2:15:32 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk/gui: moved some stuff to gui_gtk

Location:
orxonox/trunk/gui
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/gui/orxonox_gui.cc

    r3161 r3164  
    6767{
    6868 
    69   gtk_init (&argc, &argv);
    70   gtk_rc_parse( "rc" );
    71  
     69  initGTK(argc, argv);
     70
    7271  orxonoxGUI = new Window( "Grafical OrxOnoX loader, "PACKAGE_VERSION);
    7372  orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
    … …  
    112111
    113112 
    114   gtk_main();
     113  mainloopGTK();
    115114}
    116115

  • orxonox/trunk/gui/orxonox_gui.h

    r3156 r3164  
    66#ifndef _ORXONOX_GUI_H
    77#define _ORXONOX_GUI_H
    8 
    9 #if HAVE_CONFIG_H
    10 #include <config.h>
    11 #endif
    128
    139#include <iostream>

  • orxonox/trunk/gui/orxonox_gui_banner.cc

    r3154 r3164  
    4444  logoEventBox = new EventBox();
    4545  logoBox = new Box('v');
    46   logoLabel = new Label("OrxOnoX, " PACKAGE_VERSION);
     46  logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
    4747  logoImage = new Image("banner.xpm");
    4848  logoEventBox->fill(logoImage);

  • orxonox/trunk/gui/orxonox_gui_gtk.cc

    r3161 r3164  
    3939extern OrxonoxGuiExec* exec;
    4040
     41bool initGTK(int argc, char *argv[])
     42{
     43  gtk_init (&argc, &argv);
     44  gtk_rc_parse( "rc" );
     45}
     46bool mainloopGTK(void)
     47{
     48  gtk_main();
     49}
    4150/* WIDGET */
    4251

  • orxonox/trunk/gui/orxonox_gui_gtk.h

    r3161 r3164  
    66#ifndef _ORXONOX_GUI_GTK_H
    77#define _ORXONOX_GUI_GTK_H
     8
     9#if HAVE_CONFIG_H
     10#include <config.h>
     11#endif
    812
    913#include <gtk/gtkmain.h>
    … …  
    2226#include <gtk/gtkeventbox.h>
    2327
     28bool initGTK(int argc, char *argv[]);
     29bool mainloopGTK(void);
     30
    2431//! This is the topmost object that can be displayed all others are derived from it.
    2532class Widget

  • orxonox/trunk/gui/orxonox_gui_keys.cc

    r3163 r3164  
    5151  return keysFrame;
    5252}
    53 
    54 
    5553
    5654/* PLAYER */
Note: See TracChangeset for help on using the changeset viewer.