fix: TRegExEdit style hook issue

errorcalc · Apr 4, 2023 · 14655b2 · 14655b2
1 parent e2319b3
commit 14655b2
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/Source/ES.RegExControls.pas b/Source/ES.RegExControls.pas
@@ -135,7 +135,12 @@   TEsRegexEdit = class(TEdit, IRegexIndicator)
   // TEdit style hook
   TEsRegexEditStyleHook = class(TEditStyleHook)
   strict protected
+  {$IFNDEF VER350UP}
     procedure PaintBackground(Canvas: TCanvas); override;
+  {$ENDIF}
+  {$IFDEF VER350UP}
+    procedure WndProc(var Message: TMessage); override;
+  {$ENDIF}
   end;
 
   // TButtonedEdit
@@ -533,11 +538,31 @@ procedure TEsRegexEdit.SetColorInvalid(const Value: TColor);
 
 { TEsRegExEditStyleHook }
 
+{$IFNDEF VER350UP}
 procedure TEsRegexEditStyleHook.PaintBackground(Canvas: TCanvas);
 begin
   Brush.Color := Control.Brush.Color;
   inherited;
 end;
+{$ENDIF}
+
+{$IFDEF VER350UP}
+procedure TEsRegexEditStyleHook.WndProc(var Message: TMessage);
+begin
+  case Message.Msg of
+    CN_CTLCOLORMSGBOX..CN_CTLCOLORSTATIC:
+    begin
+      inherited WndProc(Message);
+      Brush.Color := Control.Brush.Color;
+      SetBkColor(Message.WParam, ColorToRGB(Brush.Color));
+      Message.Result := LRESULT(Brush.Handle);
+      Handled := True;
+    end;
+  else
+    inherited WndProc(Message);
+  end;
+end;
+{$ENDIF}
 
 { TEsRegExButtonedEdit }