Various small fixes

[wxWidgets.git] / include / wx / valtext.h

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 26422a77d81ca8e7286c9321b7c2450d58e8ae78..bd2bb8d93b35c186c85e05a06981efc3a37fa844 100644 (file)
--- 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();