Fix for ambiguities which happen in STL=1 mode under DigitalMars C++.

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

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index c5eb5c4ca2286910bd1da6ed9f3237ea6b0d8bb6..f05b8d47a824069048234a1c35dbdc7d86c6cb14 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -5,11 +5,11 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "validate.h"
 #endif
 
@@ -17,28 +17,37 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/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;
 
-#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()
 {
 }
 
-
+#endif
+  // wxUSE_VALIDATORS