aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2013-04-08 22:20:07 +0200
committerJoakim Verona2013-04-08 22:20:07 +0200
commita1c060aa21c3d17e5cca7f730d8fead6746bd29c (patch)
tree7e9c9485966167597fd70e4a3119708d46ffd4e2 /src
parentec741a19c38e9be9455c917b4951f0e967583a51 (diff)
downloademacs-a1c060aa21c3d17e5cca7f730d8fead6746bd29c.tar.gz
emacs-a1c060aa21c3d17e5cca7f730d8fead6746bd29c.zip
more robust xwgir button demo
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 77e3b00dae8..d169069c99d 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -464,7 +464,7 @@ webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer d
464 464
465 465
466void 466void
467store_xwidget_event_string(struct xwidget* xw, char* eventname,char* eventstr) 467store_xwidget_event_string(struct xwidget* xw, char* eventname, const char* eventstr)
468{ 468{
469 //refactor attempt 469 //refactor attempt
470 struct input_event event; 470 struct input_event event;
@@ -758,7 +758,7 @@ xwgir_convert_lisp_to_gir_arg(GIArgument* giarg,
758 return 0; 758 return 0;
759} 759}
760 760
761 761#if 0
762void 762void
763refactor_attempt(){ 763refactor_attempt(){
764 //this methhod should be called from xwgir-xwidget-call-method and from xwgir xwidget construction 764 //this methhod should be called from xwgir-xwidget-call-method and from xwgir xwidget construction
@@ -792,7 +792,7 @@ refactor_attempt(){
792 } 792 }
793 return Qt; 793 return Qt;
794} 794}
795 795#endif
796 796
797DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method, Sxwgir_xwidget_call_method, 3, 3, 0, 797DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method, Sxwgir_xwidget_call_method, 3, 3, 0,
798 doc: /* call xwidget object method.*/) 798 doc: /* call xwidget object method.*/)
@@ -1384,7 +1384,8 @@ DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, doc:
1384 gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); //minimum size 1384 gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); //minimum size
1385 //gtk_window_resize( GTK_WINDOW(xw->widget_osr), xw->width, xw->height); 1385 //gtk_window_resize( GTK_WINDOW(xw->widget_osr), xw->width, xw->height);
1386 gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); 1386 gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
1387 gtk_container_resize_children ( GTK_WINDOW(xw->widgetwindow_osr)); 1387 //gtk_container_resize_children ( GTK_WINDOW(xw->widgetwindow_osr));
1388 gtk_container_resize_children ( GTK_CONTAINER(xw->widgetwindow_osr));
1388 1389
1389 } 1390 }
1390 1391