merged 2 overloaded functions into a single membersections

[wxWidgets.git] / src / common / validate.cpp

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index af5104d42899388fe4b560a782808b9ccf0b1d72..d1ff855efb83c0a62146b2c6904e44b44f1d9f2a 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,28 +17,37 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+  #include "wx/defs.h"
+#endif
+
+#if wxUSE_VALIDATORS
+
+#ifndef WX_PRECOMP
+  #include "wx/window.h"

 #endif
 
 #include "wx/validate.h"
 
 const wxValidator wxDefaultValidator;
 
 #endif
 
 #include "wx/validate.h"
 
 const wxValidator wxDefaultValidator;
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
+
+// VZ: personally, I think TRUE would be more appropriate - these bells are
+//     _annoying_
+bool wxValidator::ms_isSilent = FALSE;

 
 

-wxValidator::wxValidator(void)
+wxValidator::wxValidator()

 {
 {

-  m_validatorWindow = NULL;
+  m_validatorWindow = (wxWindow *) NULL;

 }
 
 wxValidator::~wxValidator()
 {
 }
 
 }
 
 wxValidator::~wxValidator()
 {
 }
 

-
+#endif
+  // wxUSE_VALIDATORS