Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/arrstr.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-13 11:30:40 +00:00
parent 2760de09d0
commit aaa6d89a0d
23 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/wx.h
View File

@@ -18,6 +18,7 @@
#include "wx/list.h"
#include "wx/hash.h"
#include "wx/string.h"
#include "wx/arrstr.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"

15
src/common/config.cpp
View File

@@ -31,9 +31,8 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif //WX_PRECOMP
#include "wx/arrstr.h"
#endif //WX_PRECOMP
#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
@@ -309,10 +308,10 @@ enum Bracket
wxString wxExpandEnvVars(const wxString& str)
{
wxString strResult;
strResult.Alloc(str.Len());
strResult.Alloc(str.length());
size_t m;
for ( size_t n = 0; n < str.Len(); n++ ) {
for ( size_t n = 0; n < str.length(); n++ ) {
switch ( str[n] ) {
#ifdef __WXMSW__
case wxT('%'):
@@ -325,7 +324,7 @@ wxString wxExpandEnvVars(const wxString& str)
bracket = Bracket_Windows;
else
#endif //WINDOWS
if ( n == str.Len() - 1 ) {
if ( n == str.length() - 1 ) {
bracket = Bracket_None;
}
else {
@@ -347,7 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
m = n + 1;
while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
m++;
wxString strVarName(str.c_str() + n + 1, m - n - 1);
@@ -372,7 +371,7 @@ wxString wxExpandEnvVars(const wxString& str)
// check the closing bracket
if ( bracket != Bracket_None ) {
if ( m == str.Len() || str[m] != (wxChar)bracket ) {
if ( m == str.length() || str[m] != (wxChar)bracket ) {
// under MSW it's common to have '%' characters in the registry
// and it's annoying to have warnings about them each time, so
// ignroe them silently if they are not used for env vars
@@ -398,7 +397,7 @@ wxString wxExpandEnvVars(const wxString& str)
case '\\':
// backslash can be used to suppress special meaning of % and $
if ( n != str.Len() - 1 &&
if ( n != str.length() - 1 &&
(str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
strResult += str[++n];

3
src/common/dircmn.cpp
View File

@@ -29,9 +29,9 @@
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/filefn.h"
#include "wx/arrstr.h"
#endif //WX_PRECOMP
#include "wx/arrstr.h"
#include "wx/dir.h"
// ============================================================================
@@ -236,4 +236,3 @@ size_t wxDir::GetAllFiles(const wxString& dirname,
return nFiles;
}

3
src/common/sysopt.cpp
View File

@@ -31,9 +31,8 @@
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/string.h"
#endif
#include "wx/arrstr.h"
#endif
// ----------------------------------------------------------------------------
// private globals

5
src/common/tokenzr.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: tokenzr.cpp
// Name: src/common/tokenzr.cpp
// Purpose: String tokenizer
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin (almost full rewrite)
@@ -25,7 +25,10 @@
#endif
#include "wx/tokenzr.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
// Required for wxIs... functions
#include <ctype.h>

3
src/gtk/choice.cpp
View File

@@ -12,7 +12,10 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
// FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in
// favour of GtkComboBox.

3
src/gtk/combobox.cpp
View File

@@ -18,9 +18,8 @@
#include "wx/intl.h"
#include "wx/settings.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#endif
#include "wx/arrstr.h"
#endif
// We use GtkCombo which has been deprecated since GTK+ 2.3.0
// in favour of GtkComboBox for <GTK2.4 runtime

2
src/gtk/listbox.cpp
View File

@@ -22,9 +22,9 @@
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/checklst.h"
#include "wx/arrstr.h"
#endif
#include "wx/arrstr.h"
#include "wx/gtk/private.h"
#include "wx/gtk/treeentry_gtk.h"

3
src/gtk1/choice.cpp
View File

@@ -12,7 +12,10 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#include "wx/gtk1/private.h"

3
src/gtk1/combobox.cpp
View File

@@ -18,9 +18,8 @@
#include "wx/intl.h"
#include "wx/settings.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#endif
#include "wx/arrstr.h"
#endif
#include "wx/gtk1/private.h"

2
src/gtk1/listbox.cpp
View File

@@ -20,9 +20,9 @@
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/checklst.h"
#include "wx/arrstr.h"
#endif
#include "wx/arrstr.h"
#include "wx/gtk1/private.h"
#if wxUSE_TOOLTIPS

3
src/mac/carbon/checklst.cpp
View File

@@ -17,7 +17,10 @@
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#include "wx/mac/uma.h"

2
src/mac/carbon/listbox.cpp
View File

@@ -23,6 +23,7 @@
#include "wx/utils.h"
#include "wx/button.h"
#include "wx/settings.h"
#include "wx/arrstr.h"
#endif
#include "wx/toplevel.h"
@@ -34,7 +35,6 @@ END_EVENT_TABLE()
#include "wx/mac/uma.h"
#include "wx/dynarray.h"
#include "wx/arrstr.h"
// ============================================================================
// list box control implementation

2
src/mac/carbon/radiobox.cpp
View File

@@ -17,9 +17,9 @@
#ifndef WX_PRECOMP
#include "wx/radiobut.h"
#include "wx/arrstr.h"
#endif
#include "wx/arrstr.h"
#include "wx/mac/uma.h"
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

3
src/mac/classic/checklst.cpp
View File

@@ -18,7 +18,10 @@
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#include "wx/mac/uma.h"
#include <Appearance.h>

2
src/mac/classic/radiobox.cpp
View File

@@ -21,9 +21,9 @@
#ifndef WX_PRECOMP
#include "wx/radiobut.h"
#include "wx/arrstr.h"
#endif
#include "wx/arrstr.h"
#include "wx/mac/uma.h"
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

3
src/motif/checklst.cpp
View File

@@ -19,7 +19,10 @@
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
// ============================================================================
// implementation

3
src/motif/choice.cpp
View File

@@ -23,9 +23,8 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#endif
#include "wx/arrstr.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint

3
src/motif/combobox.cpp
View File

@@ -15,7 +15,10 @@
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint

3
src/motif/combobox_native.cpp
View File

@@ -15,7 +15,10 @@
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint

3
src/motif/listbox.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/arrstr.h"
#endif
#ifdef __VMS
@@ -28,8 +29,6 @@
#define XtDisplay XTDISPLAY
#endif
#include "wx/arrstr.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif

3
src/motif/radiobox.cpp
View File

@@ -22,9 +22,8 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#endif
#include "wx/arrstr.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint

2
src/palmos/volume.cpp
View File

@@ -32,9 +32,9 @@
#include "wx/icon.h"
#endif
#include "wx/intl.h"
#include "wx/arrstr.h"
#endif // WX_PRECOMP
#include "wx/arrstr.h"
#include "wx/hashmap.h"
#include <VFSMgr.h>