gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

	Changed interface to cut/copy/paste so it makes sense
	when triggered by say, menu items.

diff --git a/ChangeLog b/ChangeLog
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e8f189f2cc203027fca546448d3db9483059416..6fe1840e3925f36f36e5bdc037c8eedcc6ba599a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+       Changed interface to cut/copy/paste so it makes sense
+       when triggered by say, menu items.
+
 Sun Mar  1 03:20:39 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]

diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index eba3d26750ace7d5a2363ca0af1ed9fcbc04bd8f..31628a408c1c19562b14b27c0ec4d20e6bda13c9 100644 (file)
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -626,14 +626,14 @@ gtk_editable_select_region (GtkEditable *editable,
 }
 
 void
-gtk_editable_cut_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_cut_clipboard (GtkEditable *editable, guint32 time)
 {
-  gtk_editable_copy_clipboard (editable, event);
+  gtk_editable_copy_clipboard (editable, time);
   gtk_editable_delete_selection (editable);
 }
 
 void
-gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_copy_clipboard (GtkEditable *editable, guint32 time)
 {
   gint selection_start_pos; 
   gint selection_end_pos;
@@ -645,7 +645,7 @@ gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
     {
       if (gtk_selection_owner_set (GTK_WIDGET (editable),
                                   clipboard_atom,
-                                  event->time))
+                                  time))
        editable->clipboard_text = gtk_editable_get_chars (editable,
                                                           selection_start_pos,
                                                           selection_end_pos);
@@ -653,10 +653,10 @@ gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
 }
 
 void
-gtk_editable_paste_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_paste_clipboard (GtkEditable *editable, guint32 time)
 {
   gtk_selection_convert (GTK_WIDGET(editable), 
-                        clipboard_atom, ctext_atom, event->time);
+                        clipboard_atom, ctext_atom, time);
 }
 
 void

diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 58b34f46f0b51d5151806c6232a0177b8e9b1adb..893f8edf84ac0ae3dc91a6b3810ce714edaaff18 100644 (file)
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -36,7 +36,7 @@ extern "C" {
 typedef struct _GtkEditable       GtkEditable;
 typedef struct _GtkEditableClass  GtkEditableClass;
 
-typedef void (*GtkTextFunction) (GtkEditable  *editable, GdkEventKey *event);
+typedef void (*GtkTextFunction) (GtkEditable  *editable, guint32 time);
 
 struct _GtkEditable
 {
@@ -90,12 +90,12 @@ void       gtk_editable_delete_text    (GtkEditable      *editable,
 gchar *    gtk_editable_get_chars      (GtkEditable      *editable,
                                        gint              start_pos,
                                        gint              end_pos);
-void       gtk_editable_cut_clipboard  (GtkEditable      *editable, 
-                                       GdkEventKey      *event);
+void       gtk_editable_cut_clipboard  (GtkEditable      *editable,
+                                       guint32           time);
 void       gtk_editable_copy_clipboard (GtkEditable      *editable, 
-                                       GdkEventKey      *event);
+                                       guint32           time);
 void       gtk_editable_paste_clipboard (GtkEditable     *editable, 
-                                        GdkEventKey     *event);
+                                        guint32          time);
 void       gtk_editable_claim_selection (GtkEditable     *editable, 
                                         gboolean         claim, 
                                         guint32          time);

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 051fb21046aab15b71920245ac2edbace6c3baee..f278040772ad052eb446dcd18549192da05cb40e 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -899,11 +899,11 @@ gtk_entry_key_press (GtkWidget   *widget,
        if (event->state & GDK_SHIFT_MASK)
         {
           extend_selection = FALSE;
-          gtk_editable_paste_clipboard (editable, event);
+          gtk_editable_paste_clipboard (editable, event->time);
         }
        else if (event->state & GDK_CONTROL_MASK)
         {
-          gtk_editable_copy_clipboard (editable, event);
+          gtk_editable_copy_clipboard (editable, event->time);
         }
        else
         {
@@ -915,7 +915,7 @@ gtk_entry_key_press (GtkWidget   *widget,
       if (event->state & GDK_CONTROL_MASK)
        gtk_delete_line (entry);
       else if (event->state & GDK_SHIFT_MASK)
-       gtk_editable_cut_clipboard (editable, event);
+       gtk_editable_cut_clipboard (editable, event->time);
       else
        gtk_delete_forward_character (entry);
       break;
@@ -955,7 +955,7 @@ gtk_entry_key_press (GtkWidget   *widget,
 
              if ((key >= 'a') && (key <= 'z') && control_keys[key - 'a'])
                {
-                 (* control_keys[key - 'a']) (editable, event);
+                 (* control_keys[key - 'a']) (editable, event->time);
                  return_val = TRUE;
                }
              break;
@@ -967,7 +967,7 @@ gtk_entry_key_press (GtkWidget   *widget,
 
              if ((key >= 'a') && (key <= 'z') && alt_keys[key - 'a'])
                {
-                 (* alt_keys[key - 'a']) (editable, event);
+                 (* alt_keys[key - 'a']) (editable, event->time);
                  return_val = TRUE;
                }
              break;

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 70975145959de2c3473962ae188d00e534840331..10ce5230f8e31d58e2c5cf7558522bb2cc46ac1d 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1549,7 +1549,7 @@ gtk_text_key_press (GtkWidget   *widget,
              
              if ((key >= 'a') && (key <= 'z') && control_keys[(int) (key - 'a')])
                {
-                 (* control_keys[(int) (key - 'a')]) (editable, event);
+                 (* control_keys[(int) (key - 'a')]) (editable, event->time);
                  return_val = TRUE;
                }
 
@@ -1562,7 +1562,7 @@ gtk_text_key_press (GtkWidget   *widget,
              
              if ((key >= 'a') && (key <= 'z') && alt_keys[(int) (key - 'a')])
                {
-                 (* alt_keys[(int) (key - 'a')]) (editable, event);
+                 (* alt_keys[(int) (key - 'a')]) (editable, event->time);
                  return_val = TRUE;
                }