Changeset 4048 in orxonox.OLD for orxonox/branches
- Timestamp:
- May 5, 2005, 12:06:26 AM (20 years ago)
- Location:
- orxonox/branches/guiMerge/src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/guiMerge/src/lib/gui/gui/gui.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui.h2 \file gui.h 3 3 \brief Creation of the Gui 4 4 … … 11 11 */ 12 12 13 #ifndef _ ORXONOX_GUI_H14 #define _ ORXONOX_GUI_H13 #ifndef _GUI_H 14 #define _GUI_H 15 15 16 16 using namespace std; … … 30 30 }; 31 31 32 #endif /* _ ORXONOX_GUI_H */32 #endif /* _GUI_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_audio.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_audio.h2 \file gui_audio.h 3 3 \brief File that holds the class that creates the Audio-Options. 4 4 */ 5 5 6 #ifndef _ ORXONOX_GUI_AUDIO_H7 #define _ ORXONOX_GUI_AUDIO_H6 #ifndef _GUI_AUDIO_H 7 #define _GUI_AUDIO_H 8 8 9 9 #include "gui_element.h" … … 22 22 ~OrxonoxGuiAudio(void); 23 23 }; 24 #endif /* _ ORXONOX_GUI_AUDIO_H */24 #endif /* _GUI_AUDIO_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_banner.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_banner.h2 \file gui_banner.h 3 3 \brief File that holds the class that creates the Banner-Image.\n 4 4 This is Commercial :-) 5 5 */ 6 6 7 #ifndef _ ORXONOX_GUI_BANNER_H8 #define _ ORXONOX_GUI_BANNER_H7 #ifndef _GUI_BANNER_H 8 #define _GUI_BANNER_H 9 9 10 10 #include "gui.h" … … 20 20 21 21 22 #endif /* _ ORXONOX_GUI_BANNER_H */22 #endif /* _GUI_BANNER_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_element.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_element.h2 \file gui_element.h 3 3 \brief Definition of ... 4 4 5 5 */ 6 6 7 #ifndef _ ORXONOX_GUI_ELEMENT_H8 #define _ ORXONOX_GUI_ELEMENT_H7 #ifndef _GUI_ELEMENT_H 8 #define _GUI_ELEMENT_H 9 9 10 10 #include "gui_gtk.h" … … 26 26 }; 27 27 28 #endif /* _ ORXONOX_GUI_ELEMENT_H */28 #endif /* _GUI_ELEMENT_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_exec.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_exec.h2 \file gui_exec.h 3 3 \brief File that holds the class that creates the execute-Options. 4 4 */ 5 5 6 #ifndef _ ORXONOX_GUI_EXEC_H7 #define _ ORXONOX_GUI_EXEC_H6 #ifndef _GUI_EXEC_H 7 #define _GUI_EXEC_H 8 8 9 9 #include "gui.h" … … 67 67 68 68 69 #endif /* _ ORXONOX_GUI_EXEC_H */69 #endif /* _GUI_EXEC_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_flags.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_flags.h2 \file gui_flags.h 3 3 \brief File that holds the class that creates the flags-Text. 4 4 */ 5 5 6 #ifndef _ ORXONOX_GUI_FLAGS_H7 #define _ ORXONOX_GUI_FLAGS_H6 #ifndef _GUI_FLAGS_H 7 #define _GUI_FLAGS_H 8 8 9 9 #include "gui.h" … … 33 33 }; 34 34 }; 35 #endif /* _ ORXONOX_GUI_FLAGS_H */35 #endif /* _GUI_FLAGS_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_gtk.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_gtk.h2 \file gui_gtk.h 3 3 \brief Contains all th different Widgets. 4 4 */ 5 #ifndef _ ORXONOX_GUI_GTK_H6 #define _ ORXONOX_GUI_GTK_H5 #ifndef _GUI_GTK_H 6 #define _GUI_GTK_H 7 7 8 8 #if HAVE_CONFIG_H … … 406 406 //gint orxonox_gui_quit(GtkWidget* widget, GdkEvent* event, gpointer data); 407 407 408 #endif /* _ ORXONOX_GUI_GTK_H */408 #endif /* _GUI_GTK_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_keys.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_keys.h2 \file gui_keys.h 3 3 \brief File that holds the class that creates the Keyboard-Options. 4 4 */ 5 5 6 #ifndef _ ORXONOX_GUI_KEYS_H7 #define _ ORXONOX_GUI_KEYS_H6 #ifndef _GUI_KEYS_H 7 #define _GUI_KEYS_H 8 8 9 9 #include "gui.h" … … 78 78 79 79 80 #endif /* _ ORXONOX_GUI_KEYS_H */80 #endif /* _GUI_KEYS_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_update.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_update.h2 \file gui_update.h 3 3 \brief File that holds the class that creates the update-menu. 4 4 */ 5 5 6 #ifndef _ ORXONOX_GUI_UPDATE_H7 #define _ ORXONOX_GUI_UPDATE_H6 #ifndef _GUI_UPDATE_H 7 #define _GUI_UPDATE_H 8 8 9 9 #include "gui.h" … … 112 112 }; 113 113 114 #endif /* _ ORXONOX_GUI_UPDATE_H */114 #endif /* _GUI_UPDATE_H */ -
orxonox/branches/guiMerge/src/lib/gui/gui/gui_video.h
r4047 r4048 1 1 /*! 2 \file orxonox_gui_video.h2 \file gui_video.h 3 3 \brief File that holds the class that creates the Video-Options. 4 4 */ 5 #ifndef _ ORXONOX_GUI_VIDEO_H6 #define _ ORXONOX_GUI_VIDEO_H5 #ifndef _GUI_VIDEO_H 6 #define _GUI_VIDEO_H 7 7 8 8 #include "gui.h" … … 51 51 52 52 }; 53 #endif /* _ ORXONOX_GUI_VIDEO_H */53 #endif /* _GUI_VIDEO_H */ -
orxonox/branches/guiMerge/src/orxonox.cc
r4047 r4048 22 22 main-programmer: Patrick Boenzli 23 23 co-programmer: Christian Meyer 24 co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine 24 co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI 25 25 */ 26 26
Note: See TracChangeset
for help on using the changeset viewer.