GDK_ROOT_PARENT -> gdk_get_default_root_window

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index c4a198a6186da9898f098423a6f80c82aa1cf3dc..3e0d46d5bb1d3baf80d6801f9093107a99da1a0c 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -35,7 +35,7 @@ wxScreenDC::wxScreenDC()
 {
     m_ok = FALSE;
     m_cmap = gdk_colormap_get_system();
 {
     m_ok = FALSE;
     m_cmap = gdk_colormap_get_system();

-    m_window = GDK_ROOT_PARENT();
+    m_window = gdk_get_default_root_window();

 
     m_context = gdk_pango_context_get();
     // Note: The Sun customised version of Pango shipping with Solaris 10
 
     m_context = gdk_pango_context_get();
     // Note: The Sun customised version of Pango shipping with Solaris 10

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index bc01945de9bbae57d2861410b1a2cd809a531c1e..2e55af6f5357df2b298c8e53366aba97f2b83ed2 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -46,11 +46,11 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
     x += org_x;
     y += org_y;
 
     x += org_x;
     y += org_y;
 

-    GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() );
+    GdkGC *gc = gdk_gc_new( gdk_get_default_root_window() );

     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );
 
     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );
 

-    gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h );
+    gdk_draw_rectangle( gdk_get_default_root_window(), gc, FALSE, x, y, w, h );

     g_object_unref (G_OBJECT (gc));
 }
 
     g_object_unref (G_OBJECT (gc));
 }
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8f888b10fa4ceb78e4560003888dcf194f13000d..2e80d539f4efe2a0a69274d12cecedcc8c6bb9e6 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -269,7 +269,7 @@ gdk_window_warp_pointer (GdkWindow      *window,
                          gint            y)
 {
   if (!window)
                          gint            y)
 {
   if (!window)

-    window = GDK_ROOT_PARENT();
+    window = gdk_get_default_root_window();

 
   if (!GDK_WINDOW_DESTROYED(window))
   {
 
   if (!GDK_WINDOW_DESTROYED(window))
   {


@@ -4418,7 +4418,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
 
 bool wxWinModule::OnInit()
 {
 
 bool wxWinModule::OnInit()
 {

-    // g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() );
+    // g_eraseGC = gdk_gc_new( gdk_get_default_root_window() );

     // gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
 
     return true;
     // gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
 
     return true;