--- a/rexxgtk/trunk/grxtoolbutton.cpp
+++ b/rexxgtk/trunk/grxtoolbutton.cpp
@@ -102,7 +102,7 @@
     GtkToolItem *toolitem = gtk_tool_button_new(iconWidget, label);
 
     // Save ourself
-    context->SetObjectVariable("CSELF", context->NewPointer(toolitem));
+    context->SendMessage1(self, "set_cself", context->NewPointer(toolitem));
     g_object_set_data(G_OBJECT(toolitem), "OORXOBJECT", self);
 
     return 0;
@@ -125,7 +125,7 @@
     GtkToolItem *toolitem = gtk_tool_button_new_from_stock(sid);
 
     // Save ourself
-    context->SetObjectVariable("CSELF", context->NewPointer(toolitem));
+    context->SendMessage1(self, "set_cself", context->NewPointer(toolitem));
     g_object_set_data(G_OBJECT(toolitem), "OORXOBJECT", self);
 
     return 0;
@@ -355,7 +355,7 @@
     GtkToolItem *toolitem = gtk_separator_tool_item_new();
 
     // Save ourself
-    context->SetObjectVariable("CSELF", context->NewPointer(toolitem));
+    context->SendMessage1(self, "set_cself", context->NewPointer(toolitem));
     g_object_set_data(G_OBJECT(toolitem), "OORXOBJECT", self);
 
     return 0;