Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/orxonox_gui_banner.cc

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

• orxonox/trunk/src/gui/orxonox_gui_banner.cc (modified) (3 diffs)

orxonox/trunk/src/gui/orxonox_gui_banner.cc

@@ -29 +29 @@
    \brief Creates a new BannerEventBox and its content.
 */
-OrxonoxGuiBanner::OrxonoxGuiBanner ()
+OrxonoxGuiBanner::OrxonoxGuiBanner(void)
 {
   // Banner Itself //
-  bannerEventBox = new EventBox ("BannerEventBox");
-  bannerImage = new Image ("banner.xpm");
-  bannerEventBox->fill(bannerImage);
+  this->bannerEventBox = new EventBox("BannerEventBox");
+  this->bannerImage = new Image("banner.xpm");
+  this->bannerEventBox->fill(this->bannerImage);
 
   // Banner Window //
-  logoWindow = new Window("Logo");
+  this->logoWindow = new Window("Logo");
 
 #ifdef HAVE_GTK2
-  bannerEventBox->connectSignal ("button_press_event", logoWindow, Window::windowOpen);
+  this->bannerEventBox->connectSignal("button_press_event", this->logoWindow, Window::windowOpen);
 
-  logoWindow->connectSignal("destroy", logoWindow, Window::windowClose);
-  logoWindow->connectSignal("delete_event", logoWindow, Window::windowClose);
+  this->logoWindow->connectSignal("destroy", this->logoWindow, Window::windowClose);
+  this->logoWindow->connectSignal("delete_event", this->logoWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
-  logoEventBox = new EventBox();
-  logoBox = new Box('v');
-  logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
-  logoImage = new Image("banner.xpm");
-  logoEventBox->fill(logoImage);
+  this->logoEventBox = new EventBox();
+  this->logoBox = new Box('v');
+  this->logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
+  this->logoImage = new Image("banner.xpm");
+  this->logoEventBox->fill(this->logoImage);
   
-  logoBox->fill(logoLabel);
-  logoBox->fill(logoEventBox);
+  this->logoBox->fill(this->logoLabel);
+  this->logoBox->fill(this->logoEventBox);
 #ifdef HAVE_GTK2
-  logoEventBox->connectSignal("button_press_event",logoWindow, Window::windowClose);
+  this->logoEventBox->connectSignal("button_press_event", this->logoWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
-  logoWindow->fill (logoBox);
+  this->logoWindow->fill(this->logoBox);
   
-  Window::addWindow (logoWindow);
+  Window::addWindow(this->logoWindow);
 }
 
@@ -65 +65 @@
    \brief Destructs it.
 */
-OrxonoxGuiBanner::~OrxonoxGuiBanner ()
+OrxonoxGuiBanner::~OrxonoxGuiBanner(void)
 {
+  // nothing to do here
 }
 
@@ -73 +74 @@
    \return The EventBox, that holds the Banner.
 */
-Widget* OrxonoxGuiBanner::getWidget ()
+Widget* OrxonoxGuiBanner::getWidget(void)
 {
-  return bannerEventBox;
+  return this->bannerEventBox;
 }