Changeset 3153 in orxonox.OLD for orxonox/trunk/gui/orxonox_gui_banner.cc

Timestamp:

Dec 11, 2004, 6:09:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: more modular.

File:

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

orxonox/trunk/gui/orxonox_gui_banner.cc

@@ -35 +35 @@
   bannerImage = new Image ("banner.xpm");
   bannerEventBox->fill(bannerImage);
-  bannerEventBox->connectSignal ("button_press_event", this, LogoWindowOpen);
 
   // Banner Window //
   logoWindow = new Window("Logo");
-  logoWindow->connectSignal("destroy", this, LogoWindowClose);
-  logoWindow->connectSignal("delete_event", this, LogoWindowClose);
+    bannerEventBox->connectSignal ("button_press_event", logoWindow, Window::windowOpen);
+
+
+  logoWindow->connectSignal("destroy", logoWindow, Window::windowClose);
+  logoWindow->connectSignal("delete_event", logoWindow, Window::windowClose);
   logoEventBox = new EventBox();
   logoBox = new Box('v');
@@ -49 +51 @@
   logoBox->fill(logoLabel);
   logoBox->fill(logoEventBox);
-  logoEventBox->connectSignal("button_press_event",this,LogoWindowClose);
+  logoEventBox->connectSignal("button_press_event",logoWindow, Window::windowClose);
   
   logoWindow->fill (logoBox);
@@ -72 +74 @@
 }
 
-/**
-   \brief opens up the banner-window.\n
-   this is the Signal that does it. !!SIGNALS ARE STATIC!!
-   \param widget the widget that did it!
-   \param event the event that did it!
-   \param banner the Object that holds the banner-logo-window
-*/
-gint OrxonoxGuiBanner::LogoWindowOpen (GtkWidget* widget, GdkEvent* event, void* banner)
-{
-  static_cast<OrxonoxGuiBanner*>(banner)->logoWindow->open();
-}
 
-/**
-   \brief closes the banner-window.\n
-   this is the Signal that does it. !!SIGNALS ARE STATIC!!
-   \param widget the widget that did it!
-   \param event the event that did it!
-   \param banner the Object that holds the banner-logo-window
-*/
-gint OrxonoxGuiBanner::LogoWindowClose (GtkWidget *widget, GdkEvent* event, void* banner)
-{
-  static_cast<OrxonoxGuiBanner*>(banner)->logoWindow->close();
-  
-}