Changeset 35

Timestamp:

Aug 10, 2005 9:42:18 PM (19 years ago)

Author:

mmc

Message:

Fixed "Copy/Paste? with Desktop" so it is ignored under Windows.
This was causing the program to die immediately upon startup
in Microsoft desktops. Also, fixed the initialization of the
cutbuffer, so "Copy/Paste? with Desktop" works right away, even
if you initiate from the desktop and pull into the application.

Fixed the <<Paste>> bindings for entry/text widgets so that
paste will overwrite any selected text.

Location:

trunk/gui/scripts

Files:

• mainwin.tcl (modified) (2 diffs)
• textentry.tcl (modified) (1 diff)

trunk/gui/scripts/mainwin.tcl

@@ -22 +22 @@
     -*-helvetica-bold-o-normal-*-*-140-* widgetDefault
 
+#
+# Tk text widget doesn't honor Ctrl-V by default.  Get rid
+# of the default binding so that Ctrl-V works for <<Paste>>
+# as expected.
+#
+bind Text <Control-KeyPress-v> {}
+
+#
+# Fix the built-in <<Paste>> bindings to work properly even
+# for the X11 windowing system.  By default, Tk won't replace
+# selected text in X11.  What kind of stupid nonsense is that?
+#
+bind Entry <<Paste>> {
+    catch {
+        # always replace existing selection
+        catch { %W delete sel.first sel.last }
+
+        %W insert insert [::tk::GetSelection %W CLIPBOARD]
+        tk::EntrySeeInsert %W
+    }
+}
+proc ::tk_textPaste w {
+    global tcl_platform
+    if {![catch {::tk::GetSelection $w CLIPBOARD} sel]} {
+        if {[catch {$w cget -autoseparators} oldSeparator]} {
+            # in case we're using an older version of Tk
+            set oldSeparator 0
+        }
+        if { $oldSeparator } {
+            $w configure -autoseparators 0
+            $w edit separator
+        }
+
+        # always replace existing selection
+        catch { $w delete sel.first sel.last }
+        $w insert insert $sel
+
+        if { $oldSeparator } {
+            $w edit separator
+            $w configure -autoseparators 1
+        }
+    }
+}
+
+# ======================================================================
 itcl::class Rappture::MainWin {
     inherit itk::Toplevel
@@ -102 +147 @@
     set _sync(cutbuffer) ""
     set _sync(selection) ""
-    syncCutBuffer ifneeded
+
+    global tcl_platform
+    if {$tcl_platform(platform) == "unix"} {
+        # this sync stuff only works for X windows
+        blt::cutbuffer set ""
+        syncCutBuffer ifneeded
+    }
 }
 

trunk/gui/scripts/textentry.tcl

@@ -22 +22 @@
     -*-helvetica-medium-r-normal-*-*-100-* widgetDefault
 
-#
-# Tk text widget doesn't honor Ctrl-V by default.  Get rid
-# of the default binding so that Ctrl-V works for <<Paste>>
-# as expected.
-#
-bind Text <Control-KeyPress-v> {}
 
 itcl::class Rappture::TextEntry {