From 8f27c45b9fddfa300be5c66d35218e54dc616b04 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 4 Jul 2004 11:09:43 +0000
Subject: [PATCH] fixed IFDEF tool for blocks  from Colin

git-svn-id: trunk@5647 -
---
 components/jpeg/jpegforlazarus.pas | 4 ++--
 ide/condef.pas                     | 6 ++++--
 lcl/include/wincontrol.inc         | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/jpeg/jpegforlazarus.pas b/components/jpeg/jpegforlazarus.pas
index 0ace053ebe..0676bbdd90 100644
--- a/components/jpeg/jpegforlazarus.pas
+++ b/components/jpeg/jpegforlazarus.pas
@@ -1,7 +1,7 @@
-{ This file was automatically created by Lazarus. Do not edit!
+{  This file was automatically created by Lazarus. Do not edit!
   This source is only used to compile and install
   the package JPEGForLazarus 1.0.1.
-}
+ }
 
 unit JPEGForLazarus; 
 
diff --git a/ide/condef.pas b/ide/condef.pas
index 38b912d72f..2f8481791d 100644
--- a/ide/condef.pas
+++ b/ide/condef.pas
@@ -245,6 +245,8 @@ begin
     Indent := '';
   end;
   if IsPascal then begin
+    f := ifdef(f);
+    s := ifdef(s);
     if HasNewline then begin
       Result := Result + Indent + f + LineEnding + Indent + Text + LineEnding;
       if IsElse then
@@ -270,13 +272,13 @@ begin
         Result := Result + Text + ' {$ENDIF}';
     end;
   end else begin
-    Result := Result + '#ifdef ' + f + LineEnding + indent + Text + LineEnding;
+    Result := Result + ifdef(f) + LineEnding + indent + Text + LineEnding;
     if IsElse then
       Result := Result + '#else' + LineEnding
     else begin
       Result := Result + '#endif /* ' + f + ' */' + LineEnding;
       if IsTwo then
-        Result := Result + '#ifdef '+ s + LineEnding;
+        Result := Result + ifdef(s) + LineEnding;
     end;
     if IsTwo then begin
       Result := Result + indent + Text + LineEnding + '#endif /* ';
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 6b234730a7..1c340beea8 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -2095,7 +2095,7 @@ begin
     case Key of
       VK_RETURN:
       begin
-        if Form.DefaultControl <> nil then 
+        if Form.DefaultControl <> nil then
         begin
           Form.DefaultControl.ExecuteDefaultAction;
           Key := VK_UNKNOWN;
@@ -3755,6 +3755,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.252  2004/07/04 11:09:43  mattias
+  fixed IFDEF tool for blocks  from Colin
+
   Revision 1.251  2004/07/03 14:59:42  mattias
   fixed keydown geting all keys