xw title conversion to lisp object

2 files changed, 6 insertions, 5 deletions

diff --git a/src/xwidget.c b/src/xwidget.c
index f4362dd25ef..82fa5ad6933 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -223,7 +223,7 @@ buttonclick_handler (GtkWidget * widget, gpointer data)
 
 
   event.arg = Qnil;
-  //event.arg = Fcons (make_number (xw->id), event.arg); //TODO send the actual xwidget object now instead
+  event.arg = Fcons (xw, event.arg); //TODO send the actual xwidget object now instead
   event.arg = Fcons (intern ("buttonclick"), event.arg);
 
   kbd_buffer_store_event (&event);
@@ -243,7 +243,7 @@ send_xembed_ready_event (struct xwidget* xw, int xembedid)
   event.arg = Qnil;
   event.arg = Fcons (make_number (xembedid), event.arg);
   event.arg = Fcons (intern ("xembed-ready"), event.arg);
-//  event.arg = Fcons (make_number (xwid), event.arg); //TODO 
+  event.arg = Fcons (xw, event.arg); //TODO 
 
 
   kbd_buffer_store_event (&event);
@@ -409,11 +409,11 @@ xwidget_init_view (
   //widget creation
   if(EQ(xww->type, Qbutton))
     {
-      xv->widget = gtk_button_new_with_label (xww->title);
+      xv->widget = gtk_button_new_with_label (XSTRING(xww->title)->data);
       g_signal_connect (G_OBJECT (xv->widget), "clicked",
                         G_CALLBACK (buttonclick_handler), xww); //the model rather than the view
     } else if (EQ(xww->type, Qtoggle)) {
-    xv->widget = gtk_toggle_button_new_with_label (xww->title);
+    xv->widget = gtk_toggle_button_new_with_label (XSTRING(xww->title)->data);
   } else if (EQ(xww->type, Qsocket)) {
     xv->widget = gtk_socket_new ();
     //gtk_widget_set_app_paintable (xw->widget, TRUE); //workaround for composited sockets
diff --git a/src/xwidget.h b/src/xwidget.h
index 181d2232518..9244ff7017f 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -21,6 +21,7 @@ struct xwidget{
   Lisp_Object plist;//auxilliary data
   Lisp_Object type;//the widget type
   Lisp_Object buffer; //buffer where xwidget lives
+  Lisp_Object title;//a title that is used for button labels for instance
   
   //here ends the lisp part.
   //"height" is the marker field
@@ -32,7 +33,7 @@ struct xwidget{
   GtkContainer* widgetwindow_osr;
 
   //TODO these are WIP
-  char* title;//a title that is used for button labels for instance
+
 
   
 };