wxCheckListBox fixes: crash/memory leak when items are dynamically

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index f7ee50eec4ee5cde04063376040b4a13d3835c3c..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(const long style = wxFILTER_NONE, wxString *val = NULL);
+  wxTextValidator(long style = wxFILTER_NONE, wxString *val = (wxString *) NULL);
   wxTextValidator(const wxTextValidator& val);
 
   ~wxTextValidator();
@@ -54,7 +54,7 @@ public:
 
   // ACCESSORS
   inline long GetStyle(void) const { return m_validatorStyle; }
-  inline void SetStyle(const long style) { m_validatorStyle = style; }
+  inline void SetStyle(long style) { m_validatorStyle = style; }
 
   void SetIncludeList(const wxStringList& list);
   inline wxStringList& GetIncludeList(void) { return m_includeList; }