Browse code

Minor changes to the RegEx validator.

Naram Qashat authored on 2021/03/29 23:32:29
Showing 2 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 #include <wx/string.h>
3 3
 #include "RegExValidator.h"
4 4
 
5
-RegExValidator::RegExValidator(wxString regExpString, wxString *valPtr, int regExpFlags) : wxTextValidator(wxFILTER_EMPTY, valPtr), regEx(regExpString, regExpFlags), regExString(regExpString), regExFlags(regExpFlags)
5
+RegExValidator::RegExValidator(const wxString &regExpString, wxString *valPtr, int regExpFlags) : wxTextValidator(wxFILTER_EMPTY, valPtr), regEx(regExpString, regExpFlags), regExString(regExpString), regExFlags(regExpFlags)
6 6
 {
7 7
 }
8 8
 
... ...
@@ -1,10 +1,11 @@
1 1
 #pragma once
2 2
 
3
-#include <wx/object.h>
4 3
 #include <wx/regex.h>
5 4
 #include <wx/string.h>
6 5
 #include <wx/valtext.h>
7 6
 
7
+class wxObject;
8
+
8 9
 class RegExValidator : public wxTextValidator
9 10
 {
10 11
 protected:
... ...
@@ -12,7 +13,7 @@ protected:
12 13
 	wxString regExString;
13 14
 	int regExFlags;
14 15
 public:
15
-	RegExValidator(wxString regExpString, wxString *valPtr = nullptr, int regExpFlags = wxRE_DEFAULT);
16
+	RegExValidator(const wxString &regExpString, wxString *valPtr = nullptr, int regExpFlags = wxRE_DEFAULT);
16 17
 	wxObject *Clone() const override;
17 18
 	wxString IsValid(const wxString &str) const override;
18 19
 };