Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/gui/gl_gui/glgui_widget.cc

    r5406 r5690  
    7676 * @param signal the name of the Signal
    7777 */
    78 void GLGuiWidget::connectSignal(GLGuiSignalType signalType, Signal* signal)
     78void GLGuiWidget::connectSignal(GLGuiSignalType signalType, const Executor& signal)
    7979{
    80   if (signal == NULL || signalType >= GLGuiSignalCount)
     80  if (signalType >= GLGuiSignalCount)
    8181    return;
    8282
     
    8484    PRINTF(2)("Already connected a Signal to %s (%s) type %s... overwriting\n");
    8585
    86   this->widgetSignals[signalType] = signal;
     86  this->widgetSignals[signalType] = signal.clone();
    8787}
    8888
  • trunk/src/lib/gui/gl_gui/glgui_widget.h

    r5456 r5690  
    88
    99#include "element_2d.h"
     10#include "event.h"
     11
    1012#include "glincl.h"
    11 #include "event.h"
     13#include "executor/executor.h"
    1214
    1315// FORWARD DECLARATION
    1416class Material;
    15 class Signal; //!< @todo create this!!
    1617
    1718typedef enum
     
    4950    void hide() {};
    5051
    51     void connectSignal(GLGuiSignalType signalType, Signal* signal);
     52    void connectSignal(GLGuiSignalType signalType, const Executor& signal);
    5253    void disconnectSignal(GLGuiSignalType signalType);
    5354    bool focusOverWidget(float x, float y);
     
    7172
    7273  private:
    73     Signal*               widgetSignals[GLGuiSignalCount];
     74    Executor*             widgetSignals[GLGuiSignalCount];
    7475
    7576    bool                  focusable;        //!< If this widget can receive focus.
Note: See TracChangeset for help on using the changeset viewer.