Skip insensitive widgets. (#84061)

[~andy/gtk] / gtk / gtktext.c

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 9397c16a705dfe817b6e7e91246d1472767813dc..bce8c13f641132d60b8b55082c967bb25fb3c259 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -24,6 +24,9 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+
 #include <ctype.h>
 #include <string.h>
 #include "gdk/gdkkeysyms.h"
@@ -255,10 +258,6 @@ static gint  gtk_text_motion_notify     (GtkWidget         *widget,
                                         GdkEventMotion    *event);
 static gint  gtk_text_key_press         (GtkWidget         *widget,
                                         GdkEventKey       *event);
-static gint  gtk_text_focus_in          (GtkWidget         *widget,
-                                        GdkEventFocus     *event);
-static gint  gtk_text_focus_out         (GtkWidget         *widget,
-                                        GdkEventFocus     *event);
 
 static void move_gap (GtkText* text, guint index);
 static void make_forward_space (GtkText* text, guint len);
@@ -576,8 +575,6 @@ gtk_text_class_init (GtkTextClass *class)
   widget_class->button_release_event = gtk_text_button_release;
   widget_class->motion_notify_event = gtk_text_motion_notify;
   widget_class->key_press_event = gtk_text_key_press;
-  widget_class->focus_in_event = gtk_text_focus_in;
-  widget_class->focus_out_event = gtk_text_focus_out;
 
   old_editable_class->set_editable = gtk_text_real_set_editable;
   
@@ -1001,10 +998,11 @@ gtk_text_insert (GtkText    *text,
   
   if ((TEXT_LENGTH (text) == 0) && (text->use_wchar == FALSE))
     {
-      GtkWidget *widget;
-      widget = GTK_WIDGET (text);
+      GtkWidget *widget = GTK_WIDGET (text);
+      
       gtk_widget_ensure_style (widget);
-      if ((widget->style) && (gtk_style_get_font (widget->style)->type == GDK_FONT_FONTSET))
+      if ((widget->style) &&
+         (gtk_style_get_font (widget->style)->type == GDK_FONT_FONTSET))
        {
          text->use_wchar = TRUE;
          g_free (text->text.ch);
@@ -1348,7 +1346,7 @@ gtk_text_realize (GtkWidget *widget)
   attributes.width = MAX (1, (gint)widget->allocation.width - (gint)attributes.x * 2);
   attributes.height = MAX (1, (gint)widget->allocation.height - (gint)attributes.y * 2);
 
-  attributes.cursor = gdk_cursor_new (GDK_XTERM);
+  attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
   attributes_mask |= GDK_WA_CURSOR;
   
   text->text_area = gdk_window_new (widget->window, &attributes, attributes_mask);
@@ -1411,7 +1409,7 @@ gtk_text_style_set (GtkWidget *widget,
 
       recompute_geometry (text);
     }
-
+  
   if (text->current_font)
     text_font_unref (text->current_font);
   text->current_font = get_text_font (gtk_style_get_font (widget->style));
@@ -1649,7 +1647,6 @@ static gint
 gtk_text_scroll_timeout (gpointer data)
 {
   GtkText *text;
-  GdkEventMotion event;
   gint x, y;
   GdkModifierType mask;
   
@@ -1662,12 +1659,16 @@ gtk_text_scroll_timeout (gpointer data)
   
   if (mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK))
     {
-      event.is_hint = 0;
-      event.x = x;
-      event.y = y;
-      event.state = mask;
+      GdkEvent *event = gdk_event_new (GDK_MOTION_NOTIFY);
       
-      gtk_text_motion_notify (GTK_WIDGET (text), &event);
+      event->motion.is_hint = 0;
+      event->motion.x = x;
+      event->motion.y = y;
+      event->motion.state = mask;
+      
+      gtk_text_motion_notify (GTK_WIDGET (text), (GdkEventMotion *)event);
+
+      gdk_event_free (event);
     }
 
   GDK_THREADS_LEAVE ();
@@ -1747,6 +1748,8 @@ gtk_text_button_press (GtkWidget      *widget,
        }
       else
        {
+         GdkDisplay *display = gtk_widget_get_display (widget);
+         
          gtk_grab_add (widget);
          
          undraw_cursor (text, FALSE);
@@ -1758,8 +1761,12 @@ gtk_text_button_press (GtkWidget      *widget,
                                  text->cursor_mark.index);
          
          old_editable->has_selection = FALSE;
-         if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
-           gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
+         if (gdk_selection_owner_get_for_display (display,
+                                                  GDK_SELECTION_PRIMARY) == widget->window)
+           gtk_selection_owner_set_for_display (display,
+                                                NULL, 
+                                                GDK_SELECTION_PRIMARY,
+                                                event->time);
        }
     }
   
@@ -1772,6 +1779,8 @@ gtk_text_button_release (GtkWidget      *widget,
 {
   GtkText *text;
   GtkOldEditable *old_editable;
+  GdkDisplay *display;
+
   g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
   
@@ -1794,15 +1803,17 @@ gtk_text_button_release (GtkWidget      *widget,
     {
       text = GTK_TEXT (widget);
       old_editable = GTK_OLD_EDITABLE (widget);
+      display = gtk_widget_get_display (widget);
       
       gtk_grab_remove (widget);
       
       old_editable->has_selection = FALSE;
       if (old_editable->selection_start_pos != old_editable->selection_end_pos)
        {
-         if (gtk_selection_owner_set (widget,
-                                      GDK_SELECTION_PRIMARY,
-                                      event->time))
+         if (gtk_selection_owner_set_for_display (display,
+                                                  widget,
+                                                  GDK_SELECTION_PRIMARY,
+                                                  event->time))
            old_editable->has_selection = TRUE;
          else
            gtk_text_update_text (old_editable, old_editable->selection_start_pos,
@@ -1810,8 +1821,12 @@ gtk_text_button_release (GtkWidget      *widget,
        }
       else
        {
-         if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
-           gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
+         if (gdk_selection_owner_get_for_display (display,
+                                                  GDK_SELECTION_PRIMARY) == widget->window)
+           gtk_selection_owner_set_for_display (display, 
+                                                NULL,
+                                                GDK_SELECTION_PRIMARY, 
+                                                event->time);
        }
     }
   else if (event->button == 3)
@@ -2177,30 +2192,6 @@ gtk_text_key_press (GtkWidget   *widget,
   return return_val;
 }
 
-static gint
-gtk_text_focus_in (GtkWidget     *widget,
-                  GdkEventFocus *event)
-{
-  g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  TDEBUG (("in gtk_text_focus_in\n"));
-  
-  return (* GTK_WIDGET_CLASS (parent_class)->focus_in_event) (widget, event);
-}
-
-static gint
-gtk_text_focus_out (GtkWidget     *widget,
-                   GdkEventFocus *event)
-{
-  g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  TDEBUG (("in gtk_text_focus_out\n"));
-  
-  return (* GTK_WIDGET_CLASS (parent_class)->focus_out_event) (widget, event);
-}
-
 static void
 gtk_text_adjustment (GtkAdjustment *adjustment,
                     GtkText       *text)