diff options
| author | Jan D | 2010-07-17 18:03:16 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-17 18:03:16 +0200 |
| commit | ce6e9d7fc6474129d6bcc2e43fe221a7985efbba (patch) | |
| tree | 4561cfa93837fd5fd8996d274d516b4a3d28bc11 /src | |
| parent | 1c5f6018d55ea3c0e5430cde60624e2232d87bec (diff) | |
| download | emacs-ce6e9d7fc6474129d6bcc2e43fe221a7985efbba.tar.gz emacs-ce6e9d7fc6474129d6bcc2e43fe221a7985efbba.zip | |
* gtkutil.c (xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9914cc0767a..b2980ed64b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * gtkutil.c (xg_event_is_for_menubar): Also check that event window | 3 | * gtkutil.c (xg_event_is_for_menubar): Also check that event window |
| 4 | is related to the menu bar (Bug#6499). | 4 | is related to the menu bar (Bug#6499). |
| 5 | (xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0 | ||
| 5 | 6 | ||
| 6 | 2010-07-16 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2010-07-16 Jan Djärv <jan.h.d@swipnet.se> |
| 7 | 8 | ||
diff --git a/src/gtkutil.c b/src/gtkutil.c index 3a8212ebdb6..b1bb2e32324 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -2898,7 +2898,7 @@ xg_event_is_for_menubar (FRAME_PTR f, XEvent *event) | |||
| 2898 | for (iter = list ; iter; iter = g_list_next (iter)) | 2898 | for (iter = list ; iter; iter = g_list_next (iter)) |
| 2899 | { | 2899 | { |
| 2900 | GtkWidget *w = GTK_WIDGET (iter->data); | 2900 | GtkWidget *w = GTK_WIDGET (iter->data); |
| 2901 | if (GTK_WIDGET_MAPPED (w) && gtk_widget_intersect (w, &rec, NULL)) | 2901 | if (gtk_widget_get_mapped (w) && gtk_widget_intersect (w, &rec, NULL)) |
| 2902 | break; | 2902 | break; |
| 2903 | } | 2903 | } |
| 2904 | g_list_free (list); | 2904 | g_list_free (list); |