[glom/glom-1-28] Revert "BusyCursor: Use the non-deprecated Gdk::Cursor::create(), taking a Display."



commit d328c7f65815073135d40f0e5dcce1d235da0677
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Feb 12 13:45:40 2015 +0100

    Revert "BusyCursor: Use the non-deprecated Gdk::Cursor::create(), taking a Display."
    
    This reverts commit c58cf14e35b67884f16449f30dc63ad8c5e9f4c4.
    
    This should never have been in the stable branch.

 glom/bakery/busy_cursor.cc |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/glom/bakery/busy_cursor.cc b/glom/bakery/busy_cursor.cc
index 84cff3c..96d909e 100644
--- a/glom/bakery/busy_cursor.cc
+++ b/glom/bakery/busy_cursor.cc
@@ -9,19 +9,18 @@ namespace Glom
 BusyCursor::type_map_cursors BusyCursor::m_map_cursors;
 
 BusyCursor::BusyCursor(Gtk::Window& window, Gdk::CursorType cursor_type)
-: m_Cursor( Gdk::Cursor::create(window.get_display(), cursor_type) ),
+: m_Cursor( Gdk::Cursor::create(cursor_type) ),
   m_pWindow(&window) //If this is a nested cursor then remember the previously-set cursor, so we can restore 
it.
 {
   init();
 }
 
 BusyCursor::BusyCursor(Gtk::Window* window, Gdk::CursorType cursor_type)
-:  m_pWindow(window) //If this is a nested cursor then remember the previously-set cursor, so we can restore 
it.
+: m_Cursor( Gdk::Cursor::create(cursor_type) ),
+  m_pWindow(window) //If this is a nested cursor then remember the previously-set cursor, so we can restore 
it.
 {
-  if(m_pWindow) {
-    m_Cursor = Gdk::Cursor::create(m_pWindow->get_display(), cursor_type);
+  if(m_pWindow)
     init();
-  }
 }
 
 void BusyCursor::init()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]