test for wxLog interaction with wxYield better

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index cb3c8aef9b685db27cb565f842569427a5bdfb12..0cd221045c1c34d95bde088be584979eabc8747e 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -16,8 +16,18 @@
     #pragma interface "validate.h"
 #endif
 
     #pragma interface "validate.h"
 #endif
 

+#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
+    // wxWindows is compiled without support for wxValidator, but we still
+    // want to be able to pass wxDefaultValidator to the functions which take
+    // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
+    // everywhere
+    class WXDLLEXPORT wxValidator;
+    #define wxDefaultValidator (*((wxValidator *)NULL))
+#else // wxUSE_VALIDATORS
+

 #include "wx/event.h"
 
 #include "wx/event.h"
 

+class WXDLLEXPORT wxWindow;

 class WXDLLEXPORT wxWindowBase;
 
 /*
 class WXDLLEXPORT wxWindowBase;
 
 /*


@@ -49,7 +59,7 @@ public:
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
 
     // 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; }
 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return FALSE; }


@@ -58,7 +68,7 @@ public:
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors
     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
     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
     // validators beep by default if invalid key is pressed, these functions


@@ -77,5 +87,7 @@ private:
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 
 
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 

+#endif // wxUSE_VALIDATORS
+

 #endif
     // _WX_VALIDATEH__
 #endif
     // _WX_VALIDATEH__