remove duplicate wxTaskBarIconAreaBase::DoPopupMenu, extracting the one-line differen...

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

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index 6932875a5c8d7dcf7336d16c6df2a22f218622da..787d99bd5f60c38d8627dbeb6287aa0ac90bbafc 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        validate.cpp
+// Name:        src/common/validate.cpp
 // Purpose:     wxValidator
 // Author:      Julian Smart
 // 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__
-    #pragma implementation "validate.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -20,21 +16,21 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
+#if wxUSE_VALIDATORS
 
 #include "wx/validate.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
 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
+// VZ: personally, I think true would be more appropriate - these bells are
 //     _annoying_
-bool wxValidator::ms_isSilent = FALSE;
+bool wxValidator::ms_isSilent = false;
 
 wxValidator::wxValidator()
 {
@@ -45,4 +41,5 @@ wxValidator::~wxValidator()
 {
 }
 
-
+#endif
+  // wxUSE_VALIDATORS