Changeset 10035

Timestamp:

01/02/10 01:52:06 (8 months ago)

Author:

Sewi

Message:

Revert r10023

Files:

• trunk/Padre/lib/Padre/Wx/Editor.pm (modified) (7 diffs)

trunk/Padre/lib/Padre/Wx/Editor.pm

@@ -813 +813 @@
 sub on_smart_highlight_begin {
         my ( $self, $event ) = @_;
+
         my $selection        = $self->GetSelectedText;
-        
-        $self->put_text_to_clipboard($selection, 1);
         my $selection_length = length $selection;
         return if $selection_length == 0;
@@ -855 +854 @@
                 }
         }
-        
+
 }
 
@@ -871 +870 @@
         if ( Padre::Constant::WXGTK and defined $text and $text ne '' ) {
 
-                
-                $self->put_text_to_clipboard($text,1);
-
-                
+                # Only on X11 based platforms
+                #               Wx::wxTheClipboard->UsePrimarySelection(1);
+                $self->put_text_to_clipboard($text);
+
+                #               Wx::wxTheClipboard->UsePrimarySelection(0);
         }
 
@@ -892 +892 @@
         # It seems that another event is doing something but not within this module.
         # Please look at ticket #390 for details!
-        Wx::wxTheClipboard->UsePrimarySelection(1);
-        if (Padre::Constant::WIN32)
-        {
-                Padre::Current->editor->Paste;
-        }
-        
+
+        Padre::Current->editor->Paste;
+
         my $doc = $self->{Document};
         if ( $doc->can('event_on_middle_up') ) {
                 $doc->event_on_middle_up( $self, $event );
         }
-        Wx::wxTheClipboard->UsePrimarySelection(0);
+
         $event->Skip;
         return;
 }
+
 # Manipulate the window manager selection buffer when editor looses focus
 sub on_kill_focus {
@@ -1061 +1059 @@
 sub Paste {
         my $self = shift;
-        
+
+        # Workaround for Copy/Paste bug ticket #390
         my $text = $self->get_text_from_clipboard;
-        
+
         if ($text) {
 
@@ -1126 +1125 @@
 }
 
-# put_text_to_clipboard
-# $self->put_text_to_clipboard($text, $clipboard_Number )
-# where X11 based display systems 
-# clipboard number is either the GTK clipboard or the X11
-# clipboard.  Clipboard 1 is used for normal X11 copy onselect and
-# paste on middle button. Has no affect on windows.
-# Puts Text on the clipboard
-
 sub put_text_to_clipboard {
-        my ( $self, $text , $clipboard) = @_;
+        my ( $self, $text ) = @_;
         @_ = (); # Feeble attempt to kill Scalars Leaked
-        
-        
-        if (!defined($clipboard)){
-                $clipboard = 0 ;
-        }
-        
-        if ($text eq ''){return;}
+
+        return if $text eq '';
+
         # Backup last clipboard value:
         $self->{Clipboard_Old} = $self->get_text_from_clipboard;
-        
-        
-        
+
+        #         if $self->{Clipboard_Old} ne $self->get_text_from_clipboard;
+
         Wx::wxTheClipboard->Open;
-        Wx::wxTheClipboard->UsePrimarySelection($clipboard);
         Wx::wxTheClipboard->SetData( Wx::TextDataObject->new($text) );
         Wx::wxTheClipboard->Close;
-        
+
         return;
 }
@@ -1160 +1146 @@
 
         my $self = shift;
-        
+
         my $text = '';
         Wx::wxTheClipboard->Open;