[Gnucash-changes] r13668 - gnucash/trunk - Update frequency specification in SX from transaction dialog before moving one day back. Replace deprecated gdk_draw_pixmap.

[Andreas Koehler]

Author: andi5
Date: 2006-03-18 16:21:39 -0500 (Sat, 18 Mar 2006)
New Revision: 13668
Trac: http://svn.gnucash.org/trac/changeset/13668

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
   gnucash/trunk/src/gnome/dialog-sx-from-trans.c
Log:
Update frequency specification in SX from transaction dialog before moving one day back. Replace deprecated gdk_draw_pixmap.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-03-18 16:11:40 UTC (rev 13667)
+++ gnucash/trunk/ChangeLog	2006-03-18 21:21:39 UTC (rev 13668)
@@ -1,7 +1,12 @@
 2006-03-18  Andreas Köhler  <andi5.py at gmx.net>
 
+	* src/gnome-utils/gnc-dense-cal.c: Replace gdk_draw_pixmap with
+	  gdk_draw_drawable.
+
 	* src/gnome/dialog-sx-from-trans.c: Let glib subtract days from a
-	  GDate, because G_DATE_BAD_DAY (0) is a bad day.
+	  GDate, because G_DATE_BAD_DAY (0) is a bad day. Clear the date
+	  before setting day and update frequency specification before
+	  moving one day back.
 
 	* src/gnome-utils/gnc-embedded-window.c:
 	* src/gnome/dialog-sxsincelast.c:

Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2006-03-18 16:11:40 UTC (rev 13667)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2006-03-18 21:21:39 UTC (rev 13668)
@@ -713,26 +713,27 @@
   gchar *name;
   GString *info;
 
-  i = 0;
   fs = xaccFreqSpecMalloc( gnc_get_current_book() );
   get = sxftd_get_end_info( sxfti );
 
   tmp_tt = gnc_date_edit_get_date( sxfti->startDateGDE );
   tmpTm = g_new0( struct tm, 1 );
   *tmpTm = *localtime( &tmp_tt );
+  g_date_clear(&date, 1);
   g_date_set_day( &date, tmpTm->tm_mday );
   g_date_set_month( &date, tmpTm->tm_mon+1 );
   g_date_set_year( &date, tmpTm->tm_year+1900 );
   g_free( tmpTm );
 
+  sxftd_update_fs( sxfti, &date, fs );
+
   /* go one day before what's in the box so we can get the correct start
    * date. */
   g_date_subtract_days(&date, 1);
-
-  sxftd_update_fs( sxfti, &date, fs );
   xaccFreqSpecGetNextInstance( fs, &date, &date );
   startDate = date;
 
+  i = 0;
   while ( (i < (SXFTD_EXCAL_NUM_MONTHS * 31))
           && g_date_valid( &date )
           /* Do checking against end restriction. */

Modified: gnucash/trunk/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2006-03-18 16:11:40 UTC (rev 13667)
+++ gnucash/trunk/src/gnome-utils/gnc-dense-cal.c	2006-03-18 21:21:39 UTC (rev 13668)
@@ -757,12 +757,12 @@
 
         dcal = GNC_DENSE_CAL (widget);
         gc = widget->style->fg_gc[ GTK_WIDGET_STATE(widget) ];
-        gdk_draw_pixmap( widget->window,
-                         gc,
-                         dcal->drawbuf,
-                         0, 0, 0, 0,
-                         widget->allocation.width,
-                         widget->allocation.height );
+        gdk_draw_drawable(GDK_DRAWABLE(widget->window),
+                          gc,
+                          GDK_DRAWABLE(dcal->drawbuf),
+                          0, 0, 0, 0,
+                          widget->allocation.width,
+                          widget->allocation.height);
 
         return FALSE;
 }
@@ -977,14 +977,14 @@
                                 break;
                         }
                         idx = (dcal->month - 1 + i) % 12;
-                        gdk_draw_pixmap( dcal->drawbuf,
-                                         widget->style->fg_gc[widget->state],
-                                         dcal->monthLabels[idx],
-                                         0, 0,
-                                         dcal->leftPadding
-                                         + dcal->monthPositions[i].x,
-                                         dcal->monthPositions[i].y,
-                                         dcal->label_width, dcal->label_height );
+                        gdk_draw_drawable(GDK_DRAWABLE(dcal->drawbuf),
+                                          widget->style->fg_gc[widget->state],
+                                          GDK_DRAWABLE(dcal->monthLabels[idx]),
+                                          0, 0,
+                                          dcal->leftPadding
+                                          + dcal->monthPositions[i].x,
+                                          dcal->monthPositions[i].y,
+                                          dcal->label_width, dcal->label_height);
                 }
         }