[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog gtkutil.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] emacs/src ChangeLog gtkutil.c |
Date: |
Wed, 01 Jul 2009 15:53:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 09/07/01 15:53:00
Modified files:
src : ChangeLog gtkutil.c
Log message:
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
(xg_tool_bar_menu_proxy): Attach enter/leave events to
xg_tool_bar_proxy_help_callback.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7619&r2=1.7620
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.152&r2=1.153
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7619
retrieving revision 1.7620
diff -u -b -r1.7619 -r1.7620
--- ChangeLog 1 Jul 2009 14:02:33 -0000 1.7619
+++ ChangeLog 1 Jul 2009 15:52:58 -0000 1.7620
@@ -1,5 +1,9 @@
2009-07-01 Jan Djärv <address@hidden>
+ * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
+ (xg_tool_bar_menu_proxy): Attach enter/leave events to
+ xg_tool_bar_proxy_help_callback.
+
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
* frame.c: Qmaximized is new.
Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- gtkutil.c 1 Jul 2009 14:02:35 -0000 1.152
+++ gtkutil.c 1 Jul 2009 15:53:00 -0000 1.153
@@ -3459,10 +3459,30 @@
GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w),
XG_TOOL_BAR_PROXY_BUTTON));
xg_tool_bar_callback (wbutton, client_data);
- FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (wbutton),
- XG_FRAME_DATA);
}
+
+static gboolean
+xg_tool_bar_help_callback P_ ((GtkWidget *w,
+ GdkEventCrossing *event,
+ gpointer client_data));
+
+/* This callback is called when a help is to be shown for an item in
+ the detached tool bar when the detached tool bar it is not expanded. */
+
+static gboolean
+xg_tool_bar_proxy_help_callback (w, event, client_data)
+ GtkWidget *w;
+ GdkEventCrossing *event;
+ gpointer client_data;
+{
+ GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w),
+
XG_TOOL_BAR_PROXY_BUTTON));
+
+ xg_tool_bar_help_callback (wbutton, event, client_data);
+}
+
+
/* This callback is called when a tool item should create a proxy item,
such as for the overflow menu. Also called when the tool bar is detached.
If we don't create a proxy menu item, the detached tool bar will be
@@ -3475,7 +3495,7 @@
{
GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem));
GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox)));
- GtkWidget *wmenuitem = gtk_image_menu_item_new ();
+ GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label ("");
GtkWidget *wmenuimage;
if (gtk_button_get_use_stock (wbutton))
@@ -3545,9 +3565,24 @@
G_CALLBACK (xg_tool_bar_proxy_callback),
user_data);
+
g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON,
(gpointer) wbutton);
gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item",
wmenuitem);
+ gtk_widget_set_sensitive (wmenuitem, GTK_WIDGET_SENSITIVE (wbutton));
+
+ /* Use enter/leave notify to show help. We use the events
+ rather than the GtkButton specific signals "enter" and
+ "leave", so we can have only one callback. The event
+ will tell us what kind of event it is. */
+ g_signal_connect (G_OBJECT (wmenuitem),
+ "enter-notify-event",
+ G_CALLBACK (xg_tool_bar_proxy_help_callback),
+ user_data);
+ g_signal_connect (G_OBJECT (wmenuitem),
+ "leave-notify-event",
+ G_CALLBACK (xg_tool_bar_proxy_help_callback),
+ user_data);
return TRUE;
}
- [Emacs-diffs] emacs/src ChangeLog gtkutil.c,
Jan Djärv <=