[Gnucash-changes] Pull the local gtk_window_present() function and use the one in gtk2.

David Hampton hampton at cvs.gnucash.org
Mon Oct 3 10:36:28 EDT 2005


Log Message:
-----------
Pull the local gtk_window_present() function and use the one in gtk2.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/gnome-utils:
        dialog-utils.c
        dialog-utils.h

Revision Data
-------------
Index: dialog-utils.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-utils.h,v
retrieving revision 1.6.4.8
retrieving revision 1.6.4.9
diff -Lsrc/gnome-utils/dialog-utils.h -Lsrc/gnome-utils/dialog-utils.h -u -r1.6.4.8 -r1.6.4.9
--- src/gnome-utils/dialog-utils.h
+++ src/gnome-utils/dialog-utils.h
@@ -104,8 +104,6 @@
 \********************************************************************/
 void gnc_window_adjust_for_screen (GtkWindow * window);
 
-void gtk_window_present (GtkWindow * window); /* Remove me for GTK 2.0 */
-
 
 gboolean gnc_handle_date_accelerator (GdkEventKey *event,
                                       struct tm *tm,
Index: dialog-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/dialog-utils.c,v
retrieving revision 1.13.4.18
retrieving revision 1.13.4.19
diff -Lsrc/gnome-utils/dialog-utils.c -Lsrc/gnome-utils/dialog-utils.c -u -r1.13.4.18 -r1.13.4.19
--- src/gnome-utils/dialog-utils.c
+++ src/gnome-utils/dialog-utils.c
@@ -457,29 +457,6 @@
   gtk_widget_queue_resize(GTK_WIDGET(window));
 }
 
-/*
- * This routine must be removed when GnuCash is ported to GTK 2.0.  It
- * replicates the functionality (as much as possible) of that routine
- * using functions available in GTK 1.4.
- */
-void
-gtk_window_present (GtkWindow *window)
-{
-  GtkWidget *widget;
-
-  g_return_if_fail (GTK_IS_WINDOW (window));
-
-  widget = GTK_WIDGET (window);
-
-  if (GTK_WIDGET_VISIBLE (window)) {
-      g_assert (widget->window != NULL);
-      gdk_window_show(widget->window); 	/* De-iconify */
-      gdk_window_raise(widget->window);	/* Bring to front */
-  } else {
-      gtk_widget_show (widget);
-  }
-}
-
 gboolean
 gnc_handle_date_accelerator (GdkEventKey *event,
                              struct tm *tm,


More information about the gnucash-changes mailing list