X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..42871d38193dcaa37644ad3be452540c9f545343:/include/wx/valtext.h

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 26422a77d8..bd2bb8d93b 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __VALTEXTH__
-#define __VALTEXTH__
+#ifndef _WX_VALTEXTH__
+#define _WX_VALTEXTH__
 
 #ifdef __GNUG__
 #pragma interface "valtext.h"
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxTextValidator: public wxValidator
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
-  wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL);
+  wxTextValidator(long style = wxFILTER_NONE, wxString *val = (wxString *) NULL);
   wxTextValidator(const wxTextValidator& val);
 
   ~wxTextValidator();