added wxBU_EXACTFIT style

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 1cb97fe6049adecddd6e99f8973689059f9826d9..0cd221045c1c34d95bde088be584979eabc8747e 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -16,9 +16,19 @@
     #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"
 
 class WXDLLEXPORT wxWindow;
 #include "wx/event.h"
 
 class WXDLLEXPORT wxWindow;

+class WXDLLEXPORT wxWindowBase;

 
 /*
  A validator has up to three purposes:
 
 /*
  A validator has up to three purposes:


@@ -36,13 +46,13 @@ class WXDLLEXPORT wxValidator : public wxEvtHandler
 {
 public:
     wxValidator();
 {
 public:
     wxValidator();

-    ~wxValidator();
+    virtual ~wxValidator();

 
     // Make a clone of this validator (or return NULL) - currently necessary
     // 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).
 
     // Make a clone of this validator (or return NULL) - currently necessary
     // 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() const
+    virtual wxObject *Clone() const

         { return (wxValidator *)NULL; }
     bool Copy(const wxValidator& val)
         { m_validatorWindow = val.m_validatorWindow; return TRUE; }
         { return (wxValidator *)NULL; }
     bool Copy(const wxValidator& val)
         { m_validatorWindow = val.m_validatorWindow; return TRUE; }


@@ -58,8 +68,8 @@ public:
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors

-    wxWindow *GetWindow() const { return m_validatorWindow; }
-    void SetWindow(wxWindow *win) { m_validatorWindow = win; }
+    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
     // allow to change it
 
     // validators beep by default if invalid key is pressed, these functions
     // allow to change it


@@ -67,7 +77,7 @@ public:
     static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
 
 protected:
     static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
 
 protected:

-    wxWindow *m_validatorWindow;
+    wxWindowBase *m_validatorWindow;

 
 private:
     static bool ms_isSilent;
 
 private:
     static bool ms_isSilent;


@@ -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__