diff options
| author | Grégoire Jadi | 2013-06-04 12:41:13 +0200 |
|---|---|---|
| committer | Grégoire Jadi | 2013-06-04 12:41:13 +0200 |
| commit | 628eb368a0876085069b26299475af6fa2d9a69d (patch) | |
| tree | 69a9f822026f1faf49f93235511dc897262a3f97 /src | |
| parent | 4c71f9d37642209c3636b173b364ece36c38b57b (diff) | |
| download | emacs-628eb368a0876085069b26299475af6fa2d9a69d.tar.gz emacs-628eb368a0876085069b26299475af6fa2d9a69d.zip | |
* src/xwidget.c src/xwidget.h: Add comments to indicate to which #ifdef some #endif are associated when it's not obvious.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 14 | ||||
| -rw-r--r-- | src/xwidget.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index d169069c99d..42659723a4b 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | 68 | ||
| 69 | #include "gtkutil.h" | 69 | #include "gtkutil.h" |
| 70 | #include "font.h" | 70 | #include "font.h" |
| 71 | #endif | 71 | #endif /* HAVE_X_WINDOWS */ |
| 72 | 72 | ||
| 73 | #include <gtk/gtk.h> | 73 | #include <gtk/gtk.h> |
| 74 | #include <gdk/gdk.h> | 74 | #include <gdk/gdk.h> |
| @@ -293,7 +293,7 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 293 | unblock_input(); | 293 | unblock_input(); |
| 294 | 294 | ||
| 295 | } | 295 | } |
| 296 | #endif | 296 | #endif /* HAVE_WEBKIT_OSR */ |
| 297 | 297 | ||
| 298 | UNGCPRO; | 298 | UNGCPRO; |
| 299 | return val; | 299 | return val; |
| @@ -792,7 +792,7 @@ refactor_attempt(){ | |||
| 792 | } | 792 | } |
| 793 | return Qt; | 793 | return Qt; |
| 794 | } | 794 | } |
| 795 | #endif | 795 | #endif /* 0 */ |
| 796 | 796 | ||
| 797 | DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method, Sxwgir_xwidget_call_method, 3, 3, 0, | 797 | DEFUN ("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.*/) |
| @@ -1025,7 +1025,7 @@ xwidget_init_view (struct xwidget *xww, | |||
| 1025 | 1025 | ||
| 1026 | /* Show the stage: */ | 1026 | /* Show the stage: */ |
| 1027 | clutter_actor_show (stage); | 1027 | clutter_actor_show (stage); |
| 1028 | #endif | 1028 | #endif /* HAVE_CLUTTER */ |
| 1029 | } else if (EQ(xww->type, Qwebkit_osr)|| | 1029 | } else if (EQ(xww->type, Qwebkit_osr)|| |
| 1030 | EQ(xww->type, Qsocket_osr)|| | 1030 | EQ(xww->type, Qsocket_osr)|| |
| 1031 | (Fget(xww->type, Qcxwgir_class) != Qnil))//xwgir widgets are OSR | 1031 | (Fget(xww->type, Qcxwgir_class) != Qnil))//xwgir widgets are OSR |
| @@ -1067,7 +1067,7 @@ xwidget_init_view (struct xwidget *xww, | |||
| 1067 | /* g_signal_connect (G_OBJECT ( xv->widget), "key-release-event", */ | 1067 | /* g_signal_connect (G_OBJECT ( xv->widget), "key-release-event", */ |
| 1068 | /* G_CALLBACK (xwidget_osr_event_forward), NULL); */ | 1068 | /* G_CALLBACK (xwidget_osr_event_forward), NULL); */ |
| 1069 | 1069 | ||
| 1070 | #endif | 1070 | #endif /* HAVE_WEBKIT_OSR */ |
| 1071 | 1071 | ||
| 1072 | 1072 | ||
| 1073 | } | 1073 | } |
| @@ -1350,7 +1350,7 @@ DEFUN ("xwidget-webkit-dom-dump", Fxwidget_webkit_dom_dump, Sxwidget_webkit_dom | |||
| 1350 | 1350 | ||
| 1351 | 1351 | ||
| 1352 | 1352 | ||
| 1353 | #endif | 1353 | #endif /* HAVE_WEBKIT_OSR */ |
| 1354 | 1354 | ||
| 1355 | 1355 | ||
| 1356 | 1356 | ||
| @@ -1852,4 +1852,4 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix) | |||
| 1852 | } | 1852 | } |
| 1853 | 1853 | ||
| 1854 | 1854 | ||
| 1855 | #endif | 1855 | #endif /* HAVE_XWIDGETS */ |
diff --git a/src/xwidget.h b/src/xwidget.h index e5cfe6de902..92c6e6e3513 100644 --- a/src/xwidget.h +++ b/src/xwidget.h | |||
| @@ -107,4 +107,4 @@ struct xwidget* lookup_xwidget (Lisp_Object spec); | |||
| 107 | #define XG_XWIDGET "emacs_xwidget" | 107 | #define XG_XWIDGET "emacs_xwidget" |
| 108 | #define XG_XWIDGET_VIEW "emacs_xwidget_view" | 108 | #define XG_XWIDGET_VIEW "emacs_xwidget_view" |
| 109 | void xwidget_view_delete_all_in_window( struct window *w ); | 109 | void xwidget_view_delete_all_in_window( struct window *w ); |
| 110 | #endif | 110 | #endif /* XWIDGET_H_INCLUDED */ |