Przeglądaj źródła

Switch Textmoed IDE to use fvclip. WinClip orphaned.

Margers 1 tydzień temu
rodzic
commit
dd0570561c
3 zmienionych plików z 4 dodań i 4 usunięć
  1. 1 1
      packages/ide/fpide.pas
  2. 2 2
      packages/ide/weditor.pas
  3. 1 1
      packages/ide/wviews.pas

+ 1 - 1
packages/ide/fpide.pas

@@ -178,7 +178,7 @@ uses
   fpcatch,
   fpcatch,
 {$endif HasSignal}
 {$endif HasSignal}
 {$ifdef WinClipSupported}
 {$ifdef WinClipSupported}
-  WinClip,
+  FvClip,
 {$endif WinClipSupported}
 {$endif WinClipSupported}
 {$ifdef Unix}
 {$ifdef Unix}
   fpKeys,
   fpKeys,

+ 2 - 2
packages/ide/weditor.pas

@@ -849,7 +849,7 @@ implementation
 uses
 uses
   Strings,Video,MsgBox,App,Validate,
   Strings,Video,MsgBox,App,Validate,
 {$ifdef WinClipSupported}
 {$ifdef WinClipSupported}
-  WinClip,
+  FvClip,
 {$endif WinClipSupported}
 {$endif WinClipSupported}
 {$ifdef TEST_REGEXP}
 {$ifdef TEST_REGEXP}
   {$ifdef USE_OLD_REGEXP}
   {$ifdef USE_OLD_REGEXP}
@@ -6509,7 +6509,7 @@ begin
         OK:=false
         OK:=false
       else
       else
         OK:=GetTextWinClipBoardData(p,l);
         OK:=GetTextWinClipBoardData(p,l);
-      if OK then
+      if OK and assigned(p) then
         begin
         begin
           PasteText(p,l);
           PasteText(p,l);
           { we must free the allocated memory }
           { we must free the allocated memory }

+ 1 - 1
packages/ide/wviews.pas

@@ -303,7 +303,7 @@ implementation
 uses Mouse,
 uses Mouse,
 {     Resource,}
 {     Resource,}
 {$ifdef WinClipSupported}
 {$ifdef WinClipSupported}
-     WinClip,
+     FvClip,
 {$endif WinClipSupported}
 {$endif WinClipSupported}
      FpConst,
      FpConst,
      FVConsts,
      FVConsts,