Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index cb3c8aef9b685db27cb565f842569427a5bdfb12..370f38e473e24badc8e372e81204834abb6edde0 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -18,6 +18,13 @@
 
 #include "wx/event.h"
 
+#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
+    // wxWindows is compiled without support for wxValidator
+    class WXDLLEXPORT wxValidator;
+    #define wxDefaultValidator (*((wxValidator *)NULL))
+#else // wxUSE_VALIDATORS
+
+class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowBase;
 
 /*
@@ -49,7 +56,7 @@ public:
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
-    virtual bool Validate(wxWindowBase *WXUNUSED(parent)) { return FALSE; };
+    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; };
 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return FALSE; }
@@ -58,7 +65,7 @@ public:
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors
-    wxWindowBase *GetWindow() const { return m_validatorWindow; }
+    wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
     // validators beep by default if invalid key is pressed, these functions
@@ -75,7 +82,13 @@ private:
     DECLARE_DYNAMIC_CLASS(wxValidator)
 };
 
+#if defined(__VISAGECPP__)
+WXDLLEXPORT_DATA(extern const wxValidator*) wxDefaultValidator;
+#else
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
+#endif
+
+#endif // wxUSE_VALIDATORS
 
 #endif
     // _WX_VALIDATEH__