wxPropertyGrid member m_visPropArray removed, now always recreated from scratch in...

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

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 7ebc7870694ac22014884cba559ab97b498b04f0..c2a45e8040b5103153df7f7e9a9635e49061bba9 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,13 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
+#ifndef _WX_VALTEXT_H_
+#define _WX_VALTEXT_H_

 
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
 
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 

+class WXDLLIMPEXP_FWD_CORE wxTextEntry;
+

 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000
 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000


@@ -28,7 +30,7 @@
 #define wxFILTER_INCLUDE_CHAR_LIST 0x0040
 #define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
 
 #define wxFILTER_INCLUDE_CHAR_LIST 0x0040
 #define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
 

-class WXDLLEXPORT wxTextValidator: public wxValidator
+class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator

 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:


@@ -93,5 +95,4 @@ private:
 #endif
   // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
 #endif
   // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 

-#endif
-  // _WX_VALTEXTH__
+#endif // _WX_VALTEXT_H_