Include wx/validate.h and wx/valtext.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: valtext.cpp
|
||||
// Name: src/common/valtext.cpp
|
||||
// Purpose: wxTextValidator
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
|
||||
|
||||
#include "wx/valtext.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include <stdio.h>
|
||||
#include "wx/textctrl.h"
|
||||
@@ -26,8 +28,6 @@
|
||||
#include "wx/intl.h"
|
||||
#endif
|
||||
|
||||
#include "wx/valtext.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;
|
||||
for ( i = 0; i < (int)val.Length(); i++)
|
||||
for ( i = 0; i < (int)val.length(); i++)
|
||||
{
|
||||
if (!wxIsalpha(val[i]))
|
||||
return false;
|
||||
@@ -89,7 +89,7 @@ static bool wxIsAlpha(const wxString& val)
|
||||
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;
|
||||
@@ -271,7 +271,7 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
|
||||
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;
|
||||
@@ -282,7 +282,7 @@ bool wxTextValidator::IsInCharIncludes(const wxString& val)
|
||||
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;
|
||||
@@ -329,7 +329,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
|
||||
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
|
||||
|
Reference in New Issue
Block a user