Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jun 11, 2006, 12:49:25 PM (19 years ago)
Author:
bensch
Message:

trunk: merged the water-branche back here
removed the HACK in GameWorld in the Process (hope it is not needed anymore…

merged with command:
svn merge ​https://svn.orxonox.net/orxonoanches/water/src/lib/gui/gl_gui src/lib/gui/gl/ -r8063:HEAD

Location:
trunk/src/lib/gui/gl
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/gui/gl/glgui_cursor.cc

    r8309 r8312  
    3333    this->init();
    3434
    35     this->subscribeEvent(ES_MENU,  EV_MOUSE_MOTION);
    36     this->subscribeEvent(ES_MENU, EV_WINDOW_FOCUS);
     35    this->subscribeEvent(ES_ALL,  EV_MOUSE_MOTION);
     36    this->subscribeEvent(ES_ALL, EV_WINDOW_FOCUS);
    3737
    3838

  • trunk/src/lib/gui/gl/glgui_handler.cc

    r8145 r8312  
    4040
    4141
    42     EventHandler::getInstance()->withUNICODE(ES_MENU, true );
     42    EventHandler::getInstance()->withUNICODE(ES_ALL, true );
    4343
    4444    this->cursor = NULL;
    4545    for (unsigned int i = 0; i < EV_NUMBER; i++)
    4646    {
    47       this->subscribeEvent(ES_MENU, i);
     47      this->subscribeEvent(ES_ALL, i);
    4848    }
    4949  }

  • trunk/src/lib/gui/gl/glgui_widget.cc

    r8145 r8312  
    234234
    235235
     236
    236237  void GLGuiWidget::hide()
    237238  {

  • trunk/src/lib/gui/gl/glgui_widget.h

    r8148 r8312  
    5353    void show();
    5454    void hide();
    55 
    5655
    5756    void setParentWidget(GLGuiWidget* parent);
Note: See TracChangeset for help on using the changeset viewer.