Index: branches/proxy/src/lib/gui/gl/glgui_button.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_button.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_button.cc	(revision 9369)
@@ -79,10 +79,10 @@
   {
     GLGuiWidget::clicking(pos);
-    emit(clicked());
+    clicked.emit();
   }
   void GLGuiButton::releasing(const Vector2D& pos, bool focused)
   {
     GLGuiWidget::releasing(pos, focused);
-    emit(released());
+    released.emit();
   }
 
@@ -103,7 +103,7 @@
     {
       if (event.bPressed)
-        emit(pushed());
+        clicked.emit();
       else
-        emit(released());
+        released.emit();
       return true;
     }
Index: branches/proxy/src/lib/gui/gl/glgui_button.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_button.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_button.h	(revision 9369)
@@ -42,6 +42,6 @@
       virtual bool processEvent(const Event& event);
 
-      DeclareSignal0(clicked);
-      DeclareSignal0(released);
+      sigslot::signal0<> clicked;
+      sigslot::signal0<> released;
 
 
Index: branches/proxy/src/lib/gui/gl/glgui_checkbutton.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_checkbutton.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_checkbutton.cc	(revision 9369)
@@ -55,5 +55,5 @@
   {
     this->bActive = bActive;
-    emit(this->toggled(this->bActive));
+    this->toggled.emit(this->bActive);
   }
 
Index: branches/proxy/src/lib/gui/gl/glgui_checkbutton.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_checkbutton.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_checkbutton.h	(revision 9369)
@@ -34,5 +34,5 @@
     virtual void update() {};
 
-    DeclareSignal1(toggled, bool);
+    sigslot::signal1<bool> toggled;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_image.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_image.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_image.h	(revision 9369)
@@ -34,5 +34,5 @@
     virtual void draw() const;
 
-    DeclareSignal0(imageChanged);
+    sigslot::signal0<> imageChanged;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_inputline.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_inputline.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_inputline.cc	(revision 9369)
@@ -124,5 +124,5 @@
     this->resize();
     this->setFrontColor(Color(1,1,1,1), true);
-    emit(this->textChanged(this->_text.text()));
+    this->textChanged.emit(this->_text.text());
   }
 
@@ -146,5 +146,5 @@
   void GLGuiInputLine::pushEnter()
   {
-    emit(this->enterPushed(this->_text.text()));
+    this->enterPushed.emit(this->_text.text());
     if (this->_clearOnEnter)
       this->clear();
Index: branches/proxy/src/lib/gui/gl/glgui_inputline.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_inputline.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_inputline.h	(revision 9369)
@@ -49,6 +49,6 @@
     virtual bool processEvent(const Event& event);
 
-    DeclareSignal1(textChanged, const std::string&);
-    DeclareSignal1(enterPushed, const std::string&);
+    sigslot::signal1<const std::string&> textChanged;
+    sigslot::signal1<const std::string&> enterPushed;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_slider.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_slider.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_slider.cc	(revision 9369)
@@ -77,5 +77,5 @@
     this->_handle.setCenter(this->sliderPosition(), borderTop() + (this->getSizeY2D() - borderTop() - borderBottom()) / 2.0);
 
-    emit(valueChanged(this->_value));
+    valueChanged.emit(this->_value);
   }
 
@@ -90,5 +90,5 @@
     {
       this->_minValue = minimum;
-      emit(rangeChanged(this->_minValue, this->_maxValue));
+      rangeChanged.emit(this->_minValue, this->_maxValue);
     }
     if (this->value() < this->min())
@@ -107,5 +107,5 @@
     {
       this->_maxValue = maximum;
-      emit(rangeChanged(this->_minValue, this->_maxValue));
+      rangeChanged.emit(this->_minValue, this->_maxValue);
     }
     if (this->value() > this->max())
@@ -126,5 +126,5 @@
       this->_minValue = minimum;
       this->_maxValue = maximum;
-      emit(rangeChanged(this->_minValue, this->_maxValue));
+      rangeChanged.emit(this->_minValue, this->_maxValue);
     }
     if (this->value() < this->min())
Index: branches/proxy/src/lib/gui/gl/glgui_slider.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_slider.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_slider.h	(revision 9369)
@@ -51,6 +51,6 @@
     virtual void draw() const;
 
-    DeclareSignal1(valueChanged, float);
-    DeclareSignal2(rangeChanged, float, float);
+    sigslot::signal1<float> valueChanged;
+    sigslot::signal2<float, float> rangeChanged;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_text.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_text.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_text.cc	(revision 9369)
@@ -113,5 +113,5 @@
     this->resize();
     this->setFrontColor(_changedTextColor, true);
-    emit(this->textChanged(this->_text.text()));
+    this->textChanged.emit(this->_text.text());
   }
 
Index: branches/proxy/src/lib/gui/gl/glgui_text.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_text.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_text.h	(revision 9369)
@@ -40,5 +40,5 @@
     virtual void draw() const;
 
-    DeclareSignal1(textChanged, const std::string&);
+    sigslot::signal1<const std::string&> textChanged;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_textfield.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_textfield.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_textfield.cc	(revision 9369)
@@ -112,5 +112,5 @@
     this->resize();
     this->setFrontColor(_changedTextColor, true);
-    emit(this->textChanged(this->_text.text()));
+    this->textChanged.emit(this->_text.text());
   }
 
Index: branches/proxy/src/lib/gui/gl/glgui_textfield.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_textfield.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_textfield.h	(revision 9369)
@@ -38,5 +38,5 @@
     virtual void draw() const;
 
-    DeclareSignal1(textChanged, const std::string&);
+    sigslot::signal1<const std::string&> textChanged;
 
   protected:
Index: branches/proxy/src/lib/gui/gl/glgui_widget.cc
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_widget.cc	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_widget.cc	(revision 9369)
@@ -288,17 +288,4 @@
     this->setWidgetSize(Vector2D(x, y));
   }
-
-
-
-  void GLGuiWidget::connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor)
-  {
-    sender->connect(signal, receiver, executor);
-  }
-
-  void GLGuiWidget::connect(Signal& signal, BaseObject* receiver, Slot executor)
-  {
-    signal.push_back(SignalConnector(receiver, executor));
-  }
-
 
   void GLGuiWidget::show()
Index: branches/proxy/src/lib/gui/gl/glgui_widget.h
===================================================================
--- branches/proxy/src/lib/gui/gl/glgui_widget.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/glgui_widget.h	(revision 9369)
@@ -17,5 +17,5 @@
 
 #include "event.h"
-#include "signal_connector.h"
+#include "sigslot/signal.h"
 
 namespace OrxGui
@@ -70,9 +70,4 @@
     void release(const Vector2D& pos);
     bool clickable() const { return this->_clickable; };
-
-    static void connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor);
-    void connect(Signal& signal, BaseObject* receiver, Slot executor);
-
-    void disconnect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver);
 
     OrxGui::State state() const { return this->_state; };
Index: branches/proxy/src/lib/gui/gl/signal_connector.h
===================================================================
--- branches/proxy/src/lib/gui/gl/signal_connector.h	(revision 9357)
+++ branches/proxy/src/lib/gui/gl/signal_connector.h	(revision 9369)
@@ -12,5 +12,5 @@
 {
 
-  //////////////// TO BE IGNORED BY YOU /////
+//////////////// TO BE IGNORED BY YOU /////
 #define DeclareSignalBegin(SignalName) \
   public: \
