Changeset 1894 in orxonox.OLD

Timestamp:

May 18, 2004, 11:02:07 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: updating for transfer

Location:

orxonox/branches/gui/guicc

Files:

• orxonox_gui.cc (modified) (4 diffs)
• orxonox_gui.h (modified) (5 diffs)

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -5 +5 @@
     gtk_init (&argc, &argv);
     Window* orxonoxGUI = new Window("Graphical Orxonox Launcher");
-    orxonoxGUI->connectSignal (orxonoxGUI, "destroy", orxonox_gui_quit);
-    orxonoxGUI->show ();
+    orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
+    orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
+
+    Frame* Frametest = new Frame ("Test");
+    orxonoxGUI->fill(Frametest);
+    //Frame test = orxonoxGUI->down;
+    //test.setTitle("shit");
+    orxonoxGUI->showall ();
 
     gtk_main();
     return 0;
   }
+
+
+/* WIDGET */
+void Widget::show()
+{
+  gtk_widget_show (widget);
+}
+
+void Widget::connectSignal (char* event, gint ( *signal)( GtkWidget*, GdkEvent*, void *))
+{
+  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
+}
+
+ /* CONTAINERS*/
+
+void Container::fill (Widget *lowerWidget)
+{
+  gtk_container_add (GTK_CONTAINER(this->widget), lowerWidget->widget);
+  this->down = lowerWidget;
+}
+
+// gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
+
+  /* WINDOW */
 
 Window::Window (void)
@@ -23 +53 @@
   gtk_window_set_policy(GTK_WINDOW(widget), TRUE, TRUE, TRUE);
   this->setTitle(windowName);
-  //  g_signal_connect (G_OBJECT (widget), "delete_event", G_CALLBACK (gtk_main_quit), NULL);
-  // g_signal_connect (G_OBJECT (widget), "destroy", G_CALLBACK (orxonox_gui_quit), orxonox_settings);
-  // gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
 }
 
@@ -31 +58 @@
 {}
 
-void Window::show ()
+void Window::showall ()
 {
   gtk_widget_show_all  (widget);
@@ -41 +68 @@
 }
 
-void Widget::connectSignal (Widget* thisWidget, char* event, gint ( *signal)( GtkWidget*, GdkEvent*, void *))
-{
-  g_signal_connect (G_OBJECT (thisWidget->widget), event, G_CALLBACK (signal), NULL);
-}
 
 
-gint orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data)
+gint Window::orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data)
 {
   gtk_main_quit();
   return FALSE;
 }
+
+
+   /* FRAME */
+
+Frame::Frame (void)
+{
+  widget = gtk_frame_new ("");
+}
+Frame::Frame (char* title)
+{
+  widget = gtk_frame_new (title);
+}
+Frame::~Frame ()
+{}
+
+void Frame::setTitle (char* title)
+{
+  gtk_frame_set_label (GTK_FRAME (widget), title);
+}

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -5 +5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtkframe.h>
 
 
@@ -13 +15 @@
 
   Widget* next;
-  
+ protected:
 
  public:
-  GtkWidget* widget;
+  GtkWidget* widget;  
+
   //virtual void create ();
-  virtual void show () = 0;
   //  void addWidget ();
-  static void connectSignal (Widget* thisWidget, char* event, gint (*signal)(GtkWidget*, GdkEvent*,  void *));
+   void connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*,  void *));
+   void show ();
 };
 
@@ -31 +34 @@
   int policy;
   char* label;
-  Widget* down;
+
   
  public:
+  Widget* down;
   void setBorderWidth (int borderwidth);
   virtual void setTitle (char* title) = 0;
+  void fill (Widget *lowerWidget);
 };
 
@@ -49 +54 @@
   ~Window ();
   void setTitle (char* title);
-  void show ();
+  void showall ();
+  static gint orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data);
+
+};
+
+class Frame :public Container
+{
+ private:
+
+ public:
+  Frame (char* frameName);
+  Frame (void);
+  ~Frame ();
+  void setTitle (char* title);
 
 };
@@ -58 +76 @@
 };
 
-gint orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data);
+//gint orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data);
 
 #endif /* _ORXONOX_GUI_H */