[vte] widget: Move some methods to VteTerminalPrivate



commit 6c561ca49efa6281f591a06ce77915c6210b7d8e
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 30 17:23:34 2015 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vte.cc         |   17 +++++------------
 src/vteinternal.hh |    2 ++
 2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index f0a765e..f045c85 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -1184,14 +1184,9 @@ VteTerminalPrivate::regex_match_remove(int tag)
 }
 
 GdkCursor *
-_vte_terminal_cursor_new(VteTerminal *terminal, GdkCursorType cursor_type)
+VteTerminalPrivate::widget_cursor_new(GdkCursorType cursor_type) const
 {
-       GdkDisplay *display;
-       GdkCursor *cursor;
-
-       display = gtk_widget_get_display(&terminal->widget);
-       cursor = gdk_cursor_new_for_display(display, cursor_type);
-       return cursor;
+       return gdk_cursor_new_for_display(gtk_widget_get_display(m_widget), cursor_type);
 }
 
 int
@@ -8593,10 +8588,8 @@ VteTerminalPrivate::widget_realize()
 
        /* Create the stock cursors. */
        m_mouse_cursor_visible = TRUE;
-       m_mouse_default_cursor =
-               _vte_terminal_cursor_new(m_terminal, VTE_DEFAULT_CURSOR);
-       m_mouse_mousing_cursor =
-               _vte_terminal_cursor_new(m_terminal, VTE_MOUSING_CURSOR);
+       m_mouse_default_cursor = widget_cursor_new(VTE_DEFAULT_CURSOR);
+       m_mouse_mousing_cursor = widget_cursor_new(VTE_MOUSING_CURSOR);
 
        /* Create a GDK window for the widget. */
        attributes.window_type = GDK_WINDOW_CHILD;
@@ -8671,7 +8664,7 @@ VteTerminalPrivate::widget_realize()
        m_modifiers = 0;
 
        /* Create our invisible cursor. */
-       m_mouse_inviso_cursor = gdk_cursor_new_for_display(gtk_widget_get_display(m_widget), 
GDK_BLANK_CURSOR);
+       m_mouse_inviso_cursor = widget_cursor_new(GDK_BLANK_CURSOR);
 
         /* Make sure the style is set, bug 727614. */
         widget_style_updated();
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 300df41..28f1267 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -490,6 +490,8 @@ public:
         void widget_set_hadjustment(GtkAdjustment *adjustment);
         void widget_set_vadjustment(GtkAdjustment *adjustment);
 
+        GdkCursor *widget_cursor_new(GdkCursorType cursor_type) const;
+
         void widget_realize();
         void widget_unrealize();
         void widget_style_updated();


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