Changeset 1965 in orxonox.OLD

Timestamp:

Jun 17, 2004, 10:40:11 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: now whole objects can be passed by using signals

Location:

orxonox/branches/gui/guicc

Files:

• orxonox_gui.cc (modified) (2 diffs)
• orxonox_gui.h (modified) (3 diffs)

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -37 +37 @@
 void Widget::connectSignal (char* event, gint ( *signal)( GtkWidget*, GdkEvent*, void *))
 {
-  cout <<(void*) this <<endl;
-  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), (void*)this);
+  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
+}
+
+void Widget::connectSignal (char* event, gint ( *signal)( GtkWidget*, Widget *))
+{
+  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), this);
 }
 
@@ -149 +153 @@
 
 /* SLIDER */
-Slider::Slider (char * slidername, int start, int end)
+Slider::Slider (char* slidername, int start, int end)
 {
   widget = gtk_hscale_new_with_range (start, end, 5);
-  i =3;
+  value = start;
+  option_name = slidername;
 }
 
-gint Slider::OptionChange (GtkWidget *widget, GdkEvent *event, void* data)
+gint Slider::OptionChange (GtkWidget *widget, Widget* slider)
 {
-  cout << data << endl;
-  Slider* test = (Slider*)data;
-
-  //cout << (int)gtk_range_get_value (GTK_RANGE(test->widget)) << endl;
+  //Slider * superslider = dynamic_cast<Slider*>(slider)
+    //  dynamic_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE((Slider*)slider->widget));
+  cout << (int)gtk_range_get_value (GTK_RANGE((Slider*)slider->widget)) << endl;
 }

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -23 +23 @@
   //virtual void create ();
   //  void addWidget ();
-   void connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*,  void *));
-   void show ();
+  void connectSignal (char* event, gint (*signal)( GtkWidget*, GdkEvent*, void *));
+  void connectSignal (char* event, gint (*signal)(GtkWidget*,  Widget *));
+  void show ();
 };
 
@@ -78 +79 @@
 class Option : public Widget
 {
+ public:
   //virtual gint OptionChange (GtkWidget *widget, GdkEvent *event, gpointer data);
+  
+  int value;
+  char *option_name;
 };
 
@@ -101 +106 @@
   ~Slider();
   int i;
-  static gint OptionChange (GtkWidget *widget, GdkEvent *event, void* data);
+  static gint OptionChange (GtkWidget *widget, Widget* slider);
 };
 //gint orxonox_gui_quit ( GtkWidget *widget, GdkEvent *event, gpointer data);