[Pingus-CVS] CVS: Games/Pingus/src exit_menu.cxx,1.2,1.3 exit_menu.hxx,1.3,1.4 pingus_menu_manager.cxx,1.4,1.5 pingus_menu_manager.hxx,1.3,1.4 pingus_sub_menu.hxx,1.2,1.3

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv31318/src

Modified Files:
        exit_menu.cxx exit_menu.hxx pingus_menu_manager.cxx 
        pingus_menu_manager.hxx pingus_sub_menu.hxx 
Log Message:
moved stuff from RootGUIManager to GUIManager

Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit_menu.cxx       13 Jun 2002 14:25:12 -0000      1.2
+++ exit_menu.cxx       30 Jul 2002 01:58:16 -0000      1.3
@@ -51,22 +51,4 @@
   sur = PingusResource::load_surface ("misc/exitmenu", "core");
 }
 
-void 
-ExitMenu::on_button_release (CL_InputDevice* device, const CL_Key& key)
-{
-  if (device == CL_Input::pointers[0])
-    {
-      if (key.id == CL_MOUSE_LEFTBUTTON && key.x > CL_Display::get_width ()/2)
-       {
-         manager->pop_menu ();
-       }
-      else
-       {
-         std::cout << "ExitMenu: yes pressed, doing exit" << std::endl;
-         std::cout << "Pingus is now shutdown via: exit (EXIT_SUCCESS);" << 
std::endl;
-         exit (EXIT_SUCCESS);
-       }
-    }
-}
-
 /* EOF */

Index: exit_menu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit_menu.hxx       2 Jul 2002 15:46:58 -0000       1.3
+++ exit_menu.hxx       30 Jul 2002 01:58:16 -0000      1.4
@@ -36,9 +36,6 @@
   void draw ();
   void update (float delta);
   void preload ();
-
-  void on_button_press (CL_InputDevice*,const CL_Key &) {}
-  void on_button_release (CL_InputDevice*,const CL_Key &);
 };
 
 #endif

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pingus_menu_manager.cxx     29 Jul 2002 22:29:22 -0000      1.4
+++ pingus_menu_manager.cxx     30 Jul 2002 01:58:16 -0000      1.5
@@ -91,6 +91,7 @@
   --event_register_counter;
 }
 
+/*
 void 
 PingusMenuManager::on_button_press (CL_InputDevice* device,const CL_Key& key)
 {
@@ -127,6 +128,7 @@
   //<< device << ", " << x << ", " << y << ")" << std::endl;
   current_menu ()->on_mouse_move (device, x, y);
 }
+*/
 
 void 
 PingusMenuManager::display ()

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingus_menu_manager.hxx     29 Jul 2002 22:29:22 -0000      1.3
+++ pingus_menu_manager.hxx     30 Jul 2002 01:58:16 -0000      1.4
@@ -72,10 +72,12 @@
   void fadeout ();
 
   // !FIXME! Should use controller instead
+  /*
   void on_button_press (CL_InputDevice*,const CL_Key &);
   void on_button_release (CL_InputDevice*,const CL_Key &);
   void on_mouse_move (CL_InputDevice*, int, int);
-  
+  */
+
   /// Exit the menu manager (which means to exit the while() loop in display 
())
   void exit ();
 

Index: pingus_sub_menu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_sub_menu.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingus_sub_menu.hxx 24 Jun 2002 22:52:55 -0000      1.2
+++ pingus_sub_menu.hxx 30 Jul 2002 01:58:16 -0000      1.3
@@ -20,11 +20,13 @@
 #ifndef HEADER_PINGUS_PINGUS_SUB_MENU_HXX
 #define HEADER_PINGUS_PINGUS_SUB_MENU_HXX
 
+#include "gui/component.hxx"
+
 class CL_Key;
 class CL_InputDevice;
 class PingusMenuManager;
 
-class PingusSubMenu
+class PingusSubMenu : public GUI::Component
 {
 protected:
   PingusMenuManager* manager;
@@ -33,18 +35,8 @@
   PingusSubMenu (PingusMenuManager* m);
   virtual ~PingusSubMenu ();
 
-  /// draw the menu
-  virtual void draw () =0;
-
-  /// update the menu
-  virtual void update (float delta) =0;
-  
   /// load all the data which is needed for the menu
   virtual void preload () =0;
-
-  virtual void on_button_press (CL_InputDevice*,const CL_Key &) {}
-  virtual void on_button_release (CL_InputDevice*,const CL_Key &) {}
-  virtual void on_mouse_move (CL_InputDevice*, int, int) {}
 
   /// Return a handle to the parent menu manager
   PingusMenuManager* get_manager () { return manager; }