Changeset 5690 in orxonox.OLD for trunk/src/lib/gui

Timestamp:

Nov 22, 2005, 12:15:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: parameters of Executor are const void* instead of const char*

Location:

trunk/src/lib/gui/gl_gui

Files:

• glgui_widget.cc (modified) (2 diffs)
• glgui_widget.h (modified) (3 diffs)

trunk/src/lib/gui/gl_gui/glgui_widget.cc

@@ -76 +76 @@
  * @param signal the name of the Signal
  */
-void GLGuiWidget::connectSignal(GLGuiSignalType signalType, Signal* signal)
+void GLGuiWidget::connectSignal(GLGuiSignalType signalType, const Executor& signal)
 {
-  if (signal == NULL || signalType >= GLGuiSignalCount)
+  if (signalType >= GLGuiSignalCount)
     return;
 
@@ -84 +84 @@
     PRINTF(2)("Already connected a Signal to %s (%s) type %s... overwriting\n");
 
-  this->widgetSignals[signalType] = signal;
+  this->widgetSignals[signalType] = signal.clone();
 }
 

trunk/src/lib/gui/gl_gui/glgui_widget.h

@@ -8 +8 @@
 
 #include "element_2d.h"
+#include "event.h"
+
 #include "glincl.h"
-#include "event.h"
+#include "executor/executor.h"
 
 // FORWARD DECLARATION
 class Material;
-class Signal; //!< @todo create this!!
 
 typedef enum
@@ -49 +50 @@
     void hide() {};
 
-    void connectSignal(GLGuiSignalType signalType, Signal* signal);
+    void connectSignal(GLGuiSignalType signalType, const Executor& signal);
     void disconnectSignal(GLGuiSignalType signalType);
     bool focusOverWidget(float x, float y);
@@ -71 +72 @@
 
   private:
-    Signal*               widgetSignals[GLGuiSignalCount];
+    Executor*             widgetSignals[GLGuiSignalCount];
 
     bool                  focusable;        //!< If this widget can receive focus.