* TfpgMemo now allows the user to tab out of the component if UseTabs = False.

2 files changed, 6 insertions, 10 deletions

diff --git a/src/gui/gui_edit.pas b/src/gui/gui_edit.pas
index c81784bb..067fb34d 100644
--- a/src/gui/gui_edit.pas
+++ b/src/gui/gui_edit.pas
@@ -305,7 +305,6 @@ end;
 procedure TfpgCustomEdit.HandleKeyPress(var keycode: word;
   var shiftstate: TShiftState; var consumed: boolean);
 var
-//   lpos: integer;
   hasChanged: boolean;
 
   procedure StopSelection;
@@ -315,27 +314,22 @@ var
   end;
 
 begin
-//  writeln(Classname, '.Keypress');
   Consumed := False;
-//   lpos := FCursorPos;
   hasChanged := False;
 
   Consumed := True;
   case CheckClipBoardKey(keycode, shiftstate) of
     ckCopy:
         begin
-//          writeln('ckCopy');
           DoCopy;
         end;
     ckPaste:
         begin
-//          writeln('ckPaste');
           DoPaste;
           hasChanged := True;
         end;
     ckCut:
         begin
-//          writeln('ckCut');
           DoCopy;
           DeleteSelection;
           hasChanged := True;
diff --git a/src/gui/gui_memo.pas b/src/gui/gui_memo.pas
index e1c910ad..5f599af5 100644
--- a/src/gui/gui_memo.pas
+++ b/src/gui/gui_memo.pas
@@ -107,7 +107,7 @@ type
     property    Text: string read GetText write SetText;
     property    Font: TfpgFont read FFont;
     property    OnChange: TNotifyEvent read FOnChange write FOnChange;
-    property    UseTabs: boolean read FUseTabs write FUseTabs;
+    property    UseTabs: boolean read FUseTabs write FUseTabs default False;
     property    TabWidth: integer read FTabWidth write FTabWidth;
     property    MaxLength: integer read FMaxLength write FMaxLength;
   published
@@ -1054,10 +1054,12 @@ begin
               end;
 }
               hasChanged := True;
-            end;
+            end
+            else
+              Consumed := False;
           end;
       else
-        consumed := False;
+        Consumed := False;
     end;
 
     if Consumed then
@@ -1067,7 +1069,7 @@ begin
     end;
   end;
 
-  if consumed then
+  if Consumed then
     RePaint
   else
     inherited;