Moved all WXDLLEXPORT's to be before the return type in order to make

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

diff --git a/include/wx/validate.h b/include/wx/validate.h
index ede8ffbdfb78e0a78f9dde682fbcee150dc10f76..cb3c8aef9b685db27cb565f842569427a5bdfb12 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -18,7 +18,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxWindowBase;
 
 /*
  A validator has up to three purposes:
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxValidator : public wxEvtHandler
 {
 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.
@@ -49,7 +49,7 @@ public:
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
-    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; };
+    virtual bool Validate(wxWindowBase *WXUNUSED(parent)) { return FALSE; };
 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return FALSE; }
@@ -58,8 +58,8 @@ public:
     virtual bool TransferFromWindow() { return FALSE; };
 
     // accessors
-    wxWindow *GetWindow() const { return m_validatorWindow; }
-    void SetWindow(wxWindow *win) { m_validatorWindow = win; }
+    wxWindowBase *GetWindow() const { return m_validatorWindow; }
+    void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
     // validators beep by default if invalid key is pressed, these functions
     // allow to change it
@@ -67,7 +67,7 @@ public:
     static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
 
 protected:
-    wxWindow *m_validatorWindow;
+    wxWindowBase *m_validatorWindow;
 
 private:
     static bool ms_isSilent;