Changeset 3154 in orxonox.OLD for orxonox

Timestamp:

Dec 11, 2004, 8:12:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: gtk-fix if window gets closed by windowManager

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_banner.cc (modified) (1 diff)
• orxonox_gui_gtk.cc (modified) (1 diff)
• orxonox_gui_keys.cc (modified) (2 diffs)
• orxonox_gui_keys.h (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui_banner.cc

@@ -40 +40 @@
     bannerEventBox->connectSignal ("button_press_event", logoWindow, Window::windowOpen);
 
-
   logoWindow->connectSignal("destroy", logoWindow, Window::windowClose);
   logoWindow->connectSignal("delete_event", logoWindow, Window::windowClose);

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -292 +292 @@
   gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE);
 #if !defined(__WIN32__)
-  gtk_window_set_decorated (GTK_WINDOW (widget), FALSE);
+  //  gtk_window_set_decorated (GTK_WINDOW (widget), FALSE);
 #endif 
   gtk_container_set_border_width (GTK_CONTAINER (widget), 3);

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -59 +59 @@
 
   pKeyWindow = new Window("keys of player");
+  pKeyFrame = new Frame ("keys");
    pKeysBox = new Box('v');
     pKeysBox->fill(addKey(UP, "up"));
@@ -68 +69 @@
     closeButton = new Button("close");
     closeButton->connectSignal("button_press_event", pKeyWindow, Window::windowClose);
+
     pKeysBox->fill(closeButton);
-   pKeyWindow->fill(pKeysBox);
+    pKeyFrame->fill(pKeysBox);
+   pKeyWindow->fill(pKeyFrame);
    //  Window::addWindow(pKeyWindow);
+   pKeyWindow->connectSignal("destroy", pKeyWindow, Window::windowClose);
+   pKeyWindow->connectSignal("delete_event", pKeyWindow, Window::windowClose);
 
   openButton = new Button (player);

orxonox/trunk/gui/orxonox_gui_keys.h

@@ -23 +23 @@
   Box* keysBox;
   Player* player1;
-  Player* player2;
+  //  Player* player2;
   Button* misc;
 
@@ -38 +38 @@
  private:
   Window* pKeyWindow;
+  Frame* pKeyFrame;
   Button* openButton;
   Button* closeButton;