[JVCL-Checkins] SF.net SVN: jvcl:[12947] trunk/jvcl/run

[<ah...@us...>]

Revision: 12947
          http://jvcl.svn.sourceforge.net/jvcl/?rev=12947&view=rev
Author:   ahuser
Date:     2010-11-30 21:21:05 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
Mantis #5017: TJvMaskEdit: Don't validate on exit

Modified Paths:
--------------
    trunk/jvcl/run/JvMaskEdit.pas
    trunk/jvcl/run/JvToolEdit.pas

Modified: trunk/jvcl/run/JvMaskEdit.pas
===================================================================
--- trunk/jvcl/run/JvMaskEdit.pas	2010-11-30 20:50:46 UTC (rev 12946)
+++ trunk/jvcl/run/JvMaskEdit.pas	2010-11-30 21:21:05 UTC (rev 12947)
@@ -114,6 +114,7 @@
     property BevelOuter;
     property Alignment;
     property Caret;
+    property CheckOnExit;
     property ClipboardCommands;
     property DisabledTextColor;
     property DisabledColor;

Modified: trunk/jvcl/run/JvToolEdit.pas
===================================================================
--- trunk/jvcl/run/JvToolEdit.pas	2010-11-30 20:50:46 UTC (rev 12946)
+++ trunk/jvcl/run/JvToolEdit.pas	2010-11-30 21:21:05 UTC (rev 12947)
@@ -228,6 +228,8 @@
     FAutoCompleteItems: TStrings;
     FAutoCompleteOptions: TJvAutoCompleteOptions;
     FTextChanged: Boolean;
+    FInCMExit: Integer;
+    FCheckOnExit: Boolean;
     procedure SetAutoCompleteItems(Strings: TStrings);
     procedure SetAutoCompleteOptions(const Value: TJvAutoCompleteOptions);
     procedure SetAlignment(Value: TAlignment);
@@ -267,7 +269,6 @@
     procedure SetShowButton(const Value: Boolean);
     procedure SetDataConnector(const Value: TJvCustomComboEditDataConnector);
     procedure UpdateBtnBounds(var NewLeft, NewTop, NewWidth, NewHeight: Integer);
-    { (rb) renamed from UpdateEdit }
     procedure UpdateGroup;
     procedure CMWantSpecialKey(var Msg: TCMWantSpecialKey); message CM_WANTSPECIALKEY;
     procedure CMBiDiModeChanged(var Msg: TMessage); message CM_BIDIMODECHANGED;
@@ -352,12 +353,12 @@
     procedure SetReadOnly(Value: Boolean); virtual;
     procedure SetShowCaret;
     procedure UpdatePopupVisible;
+    procedure CMExit(var Message: TCMExit); message CM_EXIT;
     property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify;
     property AlwaysEnableButton: Boolean read FAlwaysEnableButton write FAlwaysEnableButton default False;
     property AlwaysShowPopup: Boolean read FAlwaysShowPopup write FAlwaysShowPopup default False;
     property AutoCompleteItems: TStrings read FAutoCompleteItems write SetAutoCompleteItems;
-    property AutoCompleteOptions: TJvAutoCompleteOptions read FAutoCompleteOptions
-      write SetAutoCompleteOptions default [];
+    property AutoCompleteOptions: TJvAutoCompleteOptions read FAutoCompleteOptions write SetAutoCompleteOptions default [];
     property Button: TJvEditButton read FButton;
     property ButtonFlat: Boolean read GetButtonFlat write SetButtonFlat default False;
     property ButtonHint: string read GetButtonHint write SetButtonHint;
@@ -381,6 +382,10 @@
     property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
     property SettingCursor: Boolean read GetSettingCursor;
     property ShowButton: Boolean read GetShowButton write SetShowButton default True;
+      // CheckOnExit disables the ValidateEdit call that TCustomMaskEdit executes when
+      // it receives a CM_EXIT message. If you set it to False, you should call ValidateEdit
+      // yourself when you want to validate the value (like in the OK button of a dialog).
+    property CheckOnExit: Boolean read FCheckOnExit write FCheckOnExit default True;
     property OnEnabledChanged: TNotifyEvent read FOnEnabledChanged write FOnEnabledChanged;
     property OnPopupShown: TNotifyEvent read FOnPopupShown write FOnPopupShown;
     property OnPopupHidden: TNotifyEvent read FOnPopupHidden write FOnPopupHidden;
@@ -389,6 +394,7 @@
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    procedure ValidateEdit; override;
     class function DefaultImageIndex: TImageIndex; virtual;
     class function DefaultImages: TCustomImageList; virtual;
     procedure DoClick;
@@ -841,7 +847,6 @@
     FOnInvalidDate: TJvInvalidDateEvent;
     FDefaultToday: Boolean;
     FPopupColor: TColor;
-    FCheckOnExit: Boolean;
     FBlanksChar: Char;
     FCalendarHints: TStringList;
     FStartOfWeek: TDayOfWeekName;
@@ -907,7 +912,7 @@
 
     property BlanksChar: Char read FBlanksChar write SetBlanksChar default ' ';
     property CalendarHints: TStrings read GetCalendarHints write SetCalendarHints;
-    property CheckOnExit: Boolean read FCheckOnExit write FCheckOnExit default False;
+    property CheckOnExit default False;
     property DefaultToday: Boolean read FDefaultToday write FDefaultToday default False;
     property DialogTitle: string read GetDialogTitle write SetDialogTitle stored IsCustomTitle;
     property EditMask stored False;
@@ -1211,6 +1216,7 @@
   GDirImageIndexXP: TImageIndex = -1;
   GFileImageIndexXP: TImageIndex = -1;
   {$ENDIF JVCLThemesEnabled}
+  GCoInitialized: Integer = 0;
 
 //=== Local procedures =======================================================
 
@@ -1644,7 +1650,16 @@
   FNumGlyphs := 1;
   FAutoCompleteItems := TStringList.Create;
   FAutoCompleteOptions := [];
-  CoInitialize(nil);
+  FCheckOnExit := True;
+
+  // Move to class contructor when Delphi 2010 is the minimum version
+  if GCoInitialized >= 0 then
+  begin
+    Inc(GCoInitialized);
+    if GCoInitialized = 1 then
+      if not Succeeded(CoInitialize(nil)) then
+        GCoInitialized := -1;
+  end;
   inherited OnKeyDown := LocalKeyDown;
 end;
 
@@ -1656,8 +1671,16 @@
   FAutoCompleteItems.Free;
   FDataConnector.Free;
   inherited Destroy;
+
   // call after WM_DESTROY
-  CoUninitialize;
+
+  // Move to class destructor when Delphi 2010 is the minimum version
+  if GCoInitialized > 0 then
+  begin
+    Dec(GCoInitialized);
+    if GCoInitialized = 0 then
+      CoUninitialize;
+  end;
 end;
 
 function TJvCustomComboEdit.AcceptPopup(var Value: Variant): Boolean;
@@ -1813,6 +1836,16 @@
   DoCtl3DChanged;
 end;
 
+procedure TJvCustomComboEdit.CMExit(var Message: TCMExit);
+begin
+  Inc(FInCMExit); // used for FCheckOnExit
+  try
+    inherited;
+  finally
+    Dec(FInCMExit);
+  end;
+end;
+
 procedure TJvCustomComboEdit.CMPopupCloseup(var Msg: TMessage);
 begin
   PopupCloseUp(Self, Boolean(Msg.WParam));
@@ -3011,6 +3044,12 @@
   FPopupVisible := (FPopup <> nil) and FPopup.Visible;
 end;
 
+procedure TJvCustomComboEdit.ValidateEdit;
+begin
+  if CheckOnExit or (FInCMExit = 0) then
+    inherited ValidateEdit;
+end;
+
 {$IFDEF JVCLThemesEnabled}
 procedure TJvCustomComboEdit.WMNCCalcSize(var Msg: TWMNCCalcSize);
 begin
@@ -3238,6 +3277,7 @@
   FMinDate := NullDate;
   FMaxDate := NullDate;
 
+  FCheckOnExit := False;
   FBlanksChar := ' ';
   FTitle := RsDateDlgCaption;
   FPopupColor := clMenu;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.