Changeset 3156 in orxonox.OLD for orxonox/trunk/gui/orxonox_gui_gtk.cc

Timestamp:

Dec 11, 2004, 10:45:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: setting keys is really sexy now

File:

• orxonox/trunk/gui/orxonox_gui_gtk.cc (modified) (7 diffs)

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -102 +102 @@
     \brief Connect any signal to any given Sub-widget
 */
-void Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
+gulong Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
 }
 
@@ -110 +110 @@
    \brief Connect a signal with additionally passing the whole Object
 */
-void Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *))
-{
-g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), this);
+gulong Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), this);
 }
 
@@ -118 +118 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
-void Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
 }
 
@@ -126 +126 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
-void Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
-{
-  g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+}
+
+void Widget::disconnectSignal (gulong signalID)
+{
+  g_signal_handler_disconnect (G_OBJECT (this->widget), signalID);
 }
 
@@ -374 +379 @@
 {
   static_cast<Window*>(window)->close();
-  
-}
+}
+
 /**
  * Quits the orxonox_GUI.
@@ -852 +857 @@
    \brief Redraws the widget
    Example: see void CheckButton::redraw ()
- */
+*/
 void Menu::redraw ()
 {
   gtk_option_menu_set_history (GTK_OPTION_MENU (widget), value);
+}
+
+OptionLabel::OptionLabel(char* text)
+{
+  init();
+  setTitle(text);
+}
+
+void OptionLabel::init(void)
+{
+  isOption = 4;
+
+  static_cast<Option*>(this)->init();
+
+  widget = gtk_label_new ("");
+}
+
+void OptionLabel::setTitle(char* title)
+{
+  gtk_label_set_text (GTK_LABEL (widget), title);
+}
+
+void OptionLabel::redraw(void)
+{
+  
 }
 
@@ -862 +892 @@
    You migth consider adding Label::setTitle with this.
 */
-Label:: Label ()
+Label::Label ()
 {
   this->init();