[Gnucash-changes] r12012 - gnucash/trunk - Use gtk version of various functions instead of gnome versions. Rest

David Hampton hampton at cvs.gnucash.org
Mon Nov 21 23:00:23 EST 2005


Author: hampton
Date: 2005-11-21 23:00:23 -0500 (Mon, 21 Nov 2005)
New Revision: 12012
Trac: http://svn.gnucash.org/trac/changeset/12012

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/import-export/import-main-matcher.c
   gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
Log:
Use gtk version of various functions instead of gnome versions.  Rest
of the file was converted long ago.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-22 01:36:20 UTC (rev 12011)
+++ gnucash/trunk/ChangeLog	2005-11-22 04:00:23 UTC (rev 12012)
@@ -1,5 +1,10 @@
 2005-11-21  David Hampton  <hampton at employees.org>
 
+	* src/import-export/import-main-matcher.c:
+	* src/register/register-gnome/gnucash-sheet.c: Use gtk version of
+	various functions instead of gnome versions.  Rest of the file was
+	converted long ago.
+
 	* src/gnome/glade/userpass.glade:
 	* src/gnome/dialog-userpass.c: Finish conversion to a
 	GtkDialog. Redo dialog as a table instead of boxes in boxes.

Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c	2005-11-22 01:36:20 UTC (rev 12011)
+++ gnucash/trunk/src/import-export/import-main-matcher.c	2005-11-22 04:00:23 UTC (rev 12012)
@@ -403,9 +403,9 @@
   heading_label = glade_xml_get_widget (xml, "heading_label");
   g_assert (heading_label != NULL);
 
-  /*if (parent)
-    gnome_dialog_set_parent (GNOME_DIALOG (info->dialog), 
-			     GTK_WINDOW (parent));*/
+  /* if (parent)
+    gtk_window_set_transient_for (GTK_WINDOW (info->dialog), 
+				  GTK_WINDOW (parent));*/
 
   /* Connect signals */
   glade_xml_signal_connect_data(xml, "downloaded_transaction_select_cb",
@@ -486,7 +486,6 @@
   
   /* Hide on close instead of destroy since we still need the values
      from the boxes. */
-  /*gnome_dialog_close_hides (GNOME_DIALOG (info->dialog), TRUE);*/
   gtk_widget_show_all (GTK_WIDGET (info->dialog));
   return info;
 }
@@ -497,7 +496,7 @@
   
   /* DEBUG("Begin"); */
 
-  result = gnome_dialog_run_and_close (GNOME_DIALOG (info->dialog));
+  result = gtk_dialog_run (GTK_DIALOG (info->dialog));
 
   /* DEBUG("Result was %d", result); */
 

Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2005-11-22 01:36:20 UTC (rev 12011)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2005-11-22 04:00:23 UTC (rev 12012)
@@ -1326,9 +1326,8 @@
                                           extend_selection);
 
                 if (do_popup)
-                        gnome_popup_menu_do_popup_modal
-                                (sheet->popup, NULL, NULL, event,
-                                 sheet->popup_data, widget);
+                        gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL,
+				       sheet->popup_data, event->button, event->time);
 
                 return TRUE;
         }
@@ -1356,9 +1355,8 @@
                                   new_virt_loc, event->x, changed_cells, FALSE);
 
         if (do_popup)
-                gnome_popup_menu_do_popup_modal
-                        (sheet->popup, NULL, NULL, event, sheet->popup_data, widget);
-
+		gtk_menu_popup(GTK_MENU(sheet->popup), NULL, NULL, NULL,
+			       sheet->popup_data, event->button, event->time);
         return TRUE;
 }
 



More information about the gnucash-changes mailing list