emacs: src/gtkutil.c comparison

comparison src/gtkutil.c @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0

author	Miles Bader <miles@gnu.org>
date	Sun, 16 Jan 2005 03:40:12 +0000
parents	95879cc1ed20 eb72706060ad
children	6d92d69fae33

comparison

equal deleted inserted replaced

-:f6b4d0ebf147
+:cb67264d6096
 This makes geometry handling difficult, for example -0-0 will end
 up in the wrong place as tool bar height has not been taken into account.
 So we cheat a bit by setting a height that is what it will have
 later on when tool bar items are added.  */
 if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0)
-FRAME_TOOLBAR_HEIGHT (f) = 34;
+FRAME_TOOLBAR_HEIGHT (f) = 38;
 /* We don't want this widget double buffered, because we draw on it
 with regular X drawing primitives, so from a GTK/GDK point of
 view, the widget is totally blank.  When an expose comes, this
 xg_gtk_scroll_destroy (widget, data)
 GtkWidget *widget;
 gpointer data;
 {
 gpointer p;
-int id = (int)data;
+int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */
 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
 if (p) xfree (p);
 xg_remove_widget_from_map (id);
 }
 g_signal_connect (G_OBJECT (wscroll),
 "value-changed",
 scroll_callback,
 (gpointer) bar);
+/* The EMACS_INT cast avoids a warning. */
 g_signal_connect (G_OBJECT (wscroll),
 "destroy",
 G_CALLBACK (xg_gtk_scroll_destroy),
-(gpointer) scroll_id);
+(gpointer) (EMACS_INT) scroll_id);
 /* Connect to button press and button release to detect if any scroll bar
 has the pointer.  */
 g_signal_connect (G_OBJECT (wscroll),
 "button-press-event",
 static void
 xg_tool_bar_callback (w, client_data)
 GtkWidget *w;
 gpointer client_data;
 {
-int idx = (int)client_data;
+/* The EMACS_INT cast avoids a warning. */
+int idx = (int) (EMACS_INT) client_data;
 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
 Lisp_Object key, frame;
 struct input_event event;
 EVENT_INIT (event);
 {
 FRAME_PTR f = (FRAME_PTR) client_data;
 if (f)
 {
+FRAME_X_OUTPUT (f)->toolbar_detached = 1;
 /* When detaching a tool bar, not everything dissapear.  There are
 a few pixels left that are used to drop the tool bar back into
 place.  */
 int bw = gtk_container_get_border_width (GTK_CONTAINER (wbox));
 FRAME_TOOLBAR_HEIGHT (f) = 2;
 if (f)
 {
 GtkRequisition req;
+FRAME_X_OUTPUT (f)->toolbar_detached = 0;
 gtk_widget_size_request (w, &req);
 FRAME_TOOLBAR_HEIGHT (f) = req.height;
 /* The height has changed, resize outer widget and set columns
-rows to what we had before detaching the tool bar.  */
+rows to what we had before attaching the tool bar.  */
 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
 }
 }
 /* This callback is called when the mouse enters or leaves a tool bar item.
 xg_tool_bar_help_callback (w, event, client_data)
 GtkWidget *w;
 GdkEventCrossing *event;
 gpointer client_data;
 {
-int idx = (int)client_data;
+/* The EMACS_INT cast avoids a warning. */
+int idx = (int) (EMACS_INT) client_data;
 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
 Lisp_Object help, frame;
 if (! GTK_IS_BUTTON (w))
 {
 GtkRequisition req;
 int vbox_pos = x->menubar_widget ? 1 : 0;
 x->toolbar_widget = gtk_toolbar_new ();
 x->handlebox_widget = gtk_handle_box_new ();
+x->toolbar_detached = 0;
 gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
 x->toolbar_widget);
 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget,
 FALSE, FALSE, 0);
 {
 GtkWidget *w = xg_get_image_for_pixmap (f, img, x->widget, NULL);
 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
+/* The EMACS_INT cast avoids a warning. */
 gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
 0, 0, 0,
 w,
 GTK_SIGNAL_FUNC (xg_tool_bar_callback),
-(gpointer)i);
+(gpointer) (EMACS_INT) i);
 /* Save the image so we can see if an update is needed when
 this function is called again.  */
 g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA,
 (gpointer)img->pixmap);
 /* 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.  */
+/* The EMACS_INT cast avoids a warning. */
 g_signal_connect (G_OBJECT (w),
 "enter-notify-event",
 G_CALLBACK (xg_tool_bar_help_callback),
-(gpointer)i);
+(gpointer) (EMACS_INT) i);
 g_signal_connect (G_OBJECT (w),
 "leave-notify-event",
 G_CALLBACK (xg_tool_bar_help_callback),
-(gpointer)i);
+(gpointer) (EMACS_INT) i);
 }
 }
 else
 {
 /* The child of the tool bar is a button.  Inside that button
 gtk_widget_hide (w);
 iter = g_list_next (iter);
 }
 gtk_widget_size_request (x->toolbar_widget, &new_req);
-if (old_req.height != new_req.height)
+if (old_req.height != new_req.height
+&& ! FRAME_X_OUTPUT (f)->toolbar_detached)
 {
 FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
 }

Mercurial > emacs

comparison src/gtkutil.c @ 90072:cb67264d6096