X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..3ba055acae99caf68da4bb201f66fc1030d2dbb0:/include/wx/validate.h

diff --git a/include/wx/validate.h b/include/wx/validate.h
index f068eb225c..a67d9cba9b 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __VALIDATEH__
-#define __VALIDATEH__
+#ifndef _WX_VALIDATEH__
+#define _WX_VALIDATEH__
 
 #ifdef __GNUG__
 #pragma interface "validate.h"
@@ -43,7 +43,7 @@ public:
   // if you're passing a reference to a validator.
   // Another possibility is to always pass a pointer to a new validator
   // (so the calling code can use a copy constructor of the relevant class).
-  virtual wxValidator *Clone(void) const { return NULL; }
+  virtual wxValidator *Clone(void) const { return (wxValidator *) NULL; }
   inline bool Copy(const wxValidator& val) { m_validatorWindow = val.m_validatorWindow; return TRUE; }
 
   // Called when the value in the window must be validated.
@@ -67,4 +67,4 @@ protected:
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 
 #endif
-    // __VALIDATEH__
+    // _WX_VALIDATEH__