[cairo-commit] roadster/src main.c, 1.11, 1.12 mainwindow.c, 1.13, 1.14

[Nathan Fredrickson]

Committed by: nrf

Update of /cvs/cairo/roadster/src
In directory gabe:/tmp/cvs-serv4762/src

Modified Files:
	main.c mainwindow.c 
Log Message:
    * configure.ac: Enable directives to disable deprecated features.
    * src/main.c: Call gnome_program_init() instead of deprecated gnome_program_init().
    * src/mainwindow.c: Call gdk_draw_drawable() instead of deprecated gdk_draw_pixmap().


Index: main.c
===================================================================
RCS file: /cvs/cairo/roadster/src/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- main.c	4 Mar 2005 04:06:35 -0000	1.11
+++ main.c	4 Mar 2005 04:35:42 -0000	1.12
@@ -46,7 +46,7 @@
 //	g_thread_init(NULL);
 //	gdk_threads_init();
 
-	gnome_init(PACKAGE, VERSION, argc, argv);
+	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL);
 
 	if(!main_init())
 		return 1;

Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mainwindow.c	4 Mar 2005 02:27:29 -0000	1.13
+++ mainwindow.c	4 Mar 2005 04:35:42 -0000	1.14
@@ -726,12 +726,12 @@
 
 	// Copy relevant portion of off-screen bitmap to window
 //	TIMER_BEGIN(mytimer, "BEGIN EXPOSE");
-	gdk_draw_pixmap(GTK_WIDGET(g_MainWindow.m_pDrawingArea)->window,
-                  GTK_WIDGET(g_MainWindow.m_pDrawingArea)->style->fg_gc[GTK_WIDGET_STATE(g_MainWindow.m_pDrawingArea)],
-                  pMapPixmap,
-                  event->area.x, event->area.y,
-                  event->area.x, event->area.y,
-                  event->area.width, event->area.height);
+	gdk_draw_drawable(GTK_WIDGET(g_MainWindow.m_pDrawingArea)->window,
+                      GTK_WIDGET(g_MainWindow.m_pDrawingArea)->style->fg_gc[GTK_WIDGET_STATE(g_MainWindow.m_pDrawingArea)],
+                      pMapPixmap,
+                      event->area.x, event->area.y,
+                      event->area.x, event->area.y,
+                      event->area.width, event->area.height);
 //	TIMER_END(mytimer, "END EXPOSE");
 	
 	map_release_pixmap(g_MainWindow.m_pMap);