Include wx/validate.h and wx/valtext.h according to precompiled headers of wx/wx...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/event.cpp b/src/common/event.cpp
index b270601e5e0b20d1e01d1b952a6bd2717b82d7e0..f33787b099836b33c03f6254018659d59f4ea421 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -35,17 +35,15 @@
         #include "wx/control.h"
         #include "wx/dc.h"
         #include "wx/textctrl.h"
         #include "wx/control.h"
         #include "wx/dc.h"
         #include "wx/textctrl.h"

+        #include "wx/validate.h"

     #endif // wxUSE_GUI
 #endif
 
 #include "wx/module.h"
 
     #endif // wxUSE_GUI
 #endif
 
 #include "wx/module.h"
 

-#if wxUSE_GUI
-    #include "wx/validate.h"
-#if wxUSE_STOPWATCH
+#if wxUSE_GUI && wxUSE_STOPWATCH

     #include "wx/stopwatch.h"
     #include "wx/stopwatch.h"

-#endif
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && wxUSE_STOPWATCH

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index b41574d65c3c190819bf3100443eb6581b254083..787d99bd5f60c38d8627dbeb6287aa0ac90bbafc 100644 (file)
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -18,12 +18,12 @@
 
 #if wxUSE_VALIDATORS
 
 
 #if wxUSE_VALIDATORS
 

+#include "wx/validate.h"
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
 

-#include "wx/validate.h"
-

 const wxValidator wxDefaultValidator;
 
 IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
 const wxValidator wxDefaultValidator;
 
 IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index c8546923340e76cc23872eb19fa0bd81756536b9..4acfd5831933f4e8e6153ae293ad81d03c35512c 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valtext.cpp
+// Name:        src/common/valtext.cpp

 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:


@@ -18,6 +18,8 @@
 
 #if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 
 #if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 

+#include "wx/valtext.h"
+

 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"


@@ -26,8 +28,6 @@
   #include "wx/intl.h"
 #endif
 
   #include "wx/intl.h"
 #endif
 

-#include "wx/valtext.h"
-

 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>


@@ -78,7 +78,7 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
 static bool wxIsAlpha(const wxString& val)
 {
     int i;
 static bool wxIsAlpha(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); i++)
+    for ( i = 0; i < (int)val.length(); i++)

     {
         if (!wxIsalpha(val[i]))
             return false;
     {
         if (!wxIsalpha(val[i]))
             return false;


@@ -89,7 +89,7 @@ static bool wxIsAlpha(const wxString& val)
 static bool wxIsAlphaNumeric(const wxString& val)
 {
     int i;
 static bool wxIsAlphaNumeric(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); i++)
+    for ( i = 0; i < (int)val.length(); i++)

     {
         if (!wxIsalnum(val[i]))
             return false;
     {
         if (!wxIsalnum(val[i]))
             return false;


@@ -271,7 +271,7 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
 bool wxTextValidator::IsInCharIncludes(const wxString& val)
 {
     size_t i;
 bool wxTextValidator::IsInCharIncludes(const wxString& val)
 {
     size_t i;

-    for ( i = 0; i < val.Length(); i++)
+    for ( i = 0; i < val.length(); i++)

     {
         if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
             return false;
     {
         if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
             return false;


@@ -282,7 +282,7 @@ bool wxTextValidator::IsInCharIncludes(const wxString& val)
 bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
 {
     size_t i;
 bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
 {
     size_t i;

-    for ( i = 0; i < val.Length(); i++)
+    for ( i = 0; i < val.length(); i++)

     {
        if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
             return false;
     {
        if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
             return false;


@@ -329,7 +329,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 static bool wxIsNumeric(const wxString& val)
 {
     int i;
 static bool wxIsNumeric(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); i++)
+    for ( i = 0; i < (int)val.length(); i++)

     {
         // Allow for "," (French) as well as "." -- in future we should
         // use wxSystemSettings or other to do better localisation
     {
         // Allow for "," (French) as well as "." -- in future we should
         // use wxSystemSettings or other to do better localisation

diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 3097c75ee33c400f6172e57228f1e3a43a18a604..8bac4199c789ebe3382aecf77dd62770a3609679 100644 (file)
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -34,6 +34,7 @@
     #include "wx/intl.h"
     #include "wx/stattext.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/stattext.h"
     #include "wx/filedlg.h"

+    #include "wx/valtext.h"

 #endif // WX_PRECOMP
 
 #include "wx/filename.h"
 #endif // WX_PRECOMP
 
 #include "wx/filename.h"


@@ -41,7 +42,6 @@
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"
 #include "wx/mimetype.h"
 
 #include "wx/statline.h"

-#include "wx/valtext.h"

 
 #ifdef __WXMSW__
     #include "wx/evtloop.h"     // for SetCriticalWindow()
 
 #ifdef __WXMSW__
     #include "wx/evtloop.h"     // for SetCriticalWindow()