Prechádzať zdrojové kódy

* cmCopyWin and cmPasteWin defined only once

git-svn-id: trunk@811 -
florian 20 rokov pred
rodič
commit
bffed7b938
3 zmenil súbory, kde vykonal 7 pridanie a 6 odobranie
  1. 2 0
      ide/fpconst.pas
  2. 2 6
      ide/weditor.pas
  3. 3 0
      ide/wviews.pas

+ 2 - 0
ide/fpconst.pas

@@ -182,8 +182,10 @@ const
      cmUntilReturn       = 239;
      cmUntilReturn       = 239;
      { WARNING these two are also defined in weditor.pas PM }
      { WARNING these two are also defined in weditor.pas PM }
      { and why aren't these defines then removed? Gabor }
      { and why aren't these defines then removed? Gabor }
+     { commented out, now in wviews.pas FK
      cmCopyWin           = 240;
      cmCopyWin           = 240;
      cmPasteWin          = 241;
      cmPasteWin          = 241;
+     }
      cmRegisters         = 242;
      cmRegisters         = 242;
      cmFPURegisters      = 243;
      cmFPURegisters      = 243;
      cmDoReload          = 244;
      cmDoReload          = 244;

+ 2 - 6
ide/weditor.pas

@@ -21,7 +21,7 @@ interface
 uses
 uses
   Dos,Objects,Drivers,Views,Dialogs,Menus,
   Dos,Objects,Drivers,Views,Dialogs,Menus,
   FVConsts,
   FVConsts,
-  WUtils;
+  WUtils,WViews;
 
 
 const
 const
       cmFileNameChanged      = 51234;
       cmFileNameChanged      = 51234;
@@ -712,10 +712,6 @@ type
 
 
 
 
 const
 const
-
-     cmCopyWin = 240;
-     cmPasteWin = 241;
-
      { used for ShiftDel and ShiftIns to avoid
      { used for ShiftDel and ShiftIns to avoid
        GetShiftState to be considered for extending
        GetShiftState to be considered for extending
        selection (PM) }
        selection (PM) }
@@ -766,7 +762,7 @@ uses
 {$ifdef TEST_REGEXP}
 {$ifdef TEST_REGEXP}
   regexpr,
   regexpr,
 {$endif TEST_REGEXP}
 {$endif TEST_REGEXP}
-  WConsts,WViews,WCEdit;
+  WConsts,WCEdit;
 
 
 type
 type
     RecordWord = sw_word;
     RecordWord = sw_word;

+ 3 - 0
ide/wviews.pas

@@ -20,6 +20,9 @@ uses Objects,Drivers,Views,Menus,Dialogs;
 const
 const
       evIdle                 = $8000;
       evIdle                 = $8000;
 
 
+      cmCopyWin = 240;
+      cmPasteWin = 241;
+
       cmLocalMenu            = 54100;
       cmLocalMenu            = 54100;
       cmUpdate               = 54101;
       cmUpdate               = 54101;
       cmListFocusChanged     = 54102;
       cmListFocusChanged     = 54102;