dasher r3651 - in trunk: . Src/Gtk2

[thomashpa svn gnome org]

Author: thomashpa
Date: Wed Mar  4 19:16:42 2009
New Revision: 3651
URL: http://svn.gnome.org/viewvc/dasher?rev=3651&view=rev

Log:
Replace deprecated gtk symbols. Bug #571384

Modified:
   trunk/ChangeLog
   trunk/Src/Gtk2/CanvasExperimental.cpp
   trunk/Src/Gtk2/dasher_main.cpp

Modified: trunk/Src/Gtk2/CanvasExperimental.cpp
==============================================================================
--- trunk/Src/Gtk2/CanvasExperimental.cpp	(original)
+++ trunk/Src/Gtk2/CanvasExperimental.cpp	Wed Mar  4 19:16:42 2009
@@ -181,8 +181,7 @@
 
   graphics_context = m_pCanvas->style->fg_gc[GTK_WIDGET_STATE(m_pCanvas)];
 
-
-  gdk_pixbuf_render_to_drawable(display_pixbuf,m_pCanvas->window, graphics_context,0, 0,0,0, m_iWidth,m_iHeight,  GDK_RGB_DITHER_NORMAL,0,0);
+  gdk_draw_pixbuf(m_pCanvas->window, graphics_context, display_pixbuf, 0, 0, 0, 0, m_iWidth,m_iHeight, GDK_RGB_DITHER_NORMAL, 0, 0);
 }
 
 void CCanvas::DrawRectangle(int x1, int y1, int x2, int y2, int Color, int iOutlineColour, Opts::ColorSchemes ColorScheme, bool bDrawOutline, bool bFill, int iThickness) {

Modified: trunk/Src/Gtk2/dasher_main.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_main.cpp	(original)
+++ trunk/Src/Gtk2/dasher_main.cpp	Wed Mar  4 19:16:42 2009
@@ -536,16 +536,16 @@
   g_object_ref(options_menu);
   g_object_ref(help_menu);
 
-  gtk_menu_item_remove_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "menuitem4")));
-  gtk_menu_item_remove_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "options1")));
-  gtk_menu_item_remove_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "menuitem7")));
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "menuitem4")), NULL);
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "options1")), NULL);
+  gtk_menu_item_set_submenu(GTK_MENU_ITEM(glade_xml_get_widget(pPrivate->pGladeXML, "menuitem7")), NULL);
 
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(file_menu_item),file_menu);
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(options_menu_item),options_menu); 
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_menu_item),help_menu);
-  gtk_menu_append(main_menu, file_menu_item);
-  gtk_menu_append(main_menu, options_menu_item);
-  gtk_menu_append(main_menu, help_menu_item);
+  gtk_menu_shell_append((GtkMenuShell *)main_menu, file_menu_item);
+  gtk_menu_shell_append((GtkMenuShell *)main_menu, options_menu_item);
+  gtk_menu_shell_append((GtkMenuShell *)main_menu, help_menu_item); 
 
   g_object_unref(file_menu);
   g_object_unref(options_menu);
@@ -1262,7 +1262,7 @@
 dasher_main_speed_changed(DasherMain *pSelf) {
   DasherMainPrivate *pPrivate = DASHER_MAIN_GET_PRIVATE(pSelf);
   
-  int iNewValue( static_cast<int>(round(gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(pPrivate->pSpeedBox)) * 100)));
+  int iNewValue( static_cast<int>(round(gtk_spin_button_get_value(GTK_SPIN_BUTTON(pPrivate->pSpeedBox)) * 100)));
   
   if(dasher_app_settings_get_long(pPrivate->pAppSettings, LP_MAX_BITRATE) != iNewValue)
     dasher_app_settings_set_long(pPrivate->pAppSettings, LP_MAX_BITRATE, iNewValue);