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

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

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"

View File

@ -31,10 +31,9 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/arrstr.h"
#endif //WX_PRECOMP
#include "wx/arrstr.h"
#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
#include "wx/file.h"
@ -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];

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;
}

View File

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

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"
#include "wx/arrstr.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
// Required for wxIs... functions
#include <ctype.h>

View File

@ -12,7 +12,10 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#include "wx/arrstr.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.

View File

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

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"

View File

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

View File

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

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

View File

@ -17,7 +17,10 @@
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
#include "wx/arrstr.h"
#ifndef WX_PRECOMP
#include "wx/arrstr.h"
#endif
#include "wx/mac/uma.h"
@ -37,7 +40,7 @@ public:
~wxMacDataBrowserCheckListControl();
virtual wxMacListBoxItem* CreateItem();
virtual bool MacIsChecked(unsigned int n) const;
virtual void MacCheck(unsigned int n, bool bCheck = true);
};
@ -87,7 +90,7 @@ bool wxCheckListBox::Create(
MacPostControlCreate(pos,size);
InsertItems( n , choices , 0 );
InsertItems( n , choices , 0 );
// Needed because it is a wxControlWithItems
SetBestSize( size );
@ -119,9 +122,9 @@ void wxCheckListBox::Check(unsigned int item, bool check)
}
}
wxMacCheckListControl* wxCheckListBox::GetPeer() const
{
return dynamic_cast<wxMacCheckListControl*>(m_peer);
wxMacCheckListControl* wxCheckListBox::GetPeer() const
{
return dynamic_cast<wxMacCheckListControl*>(m_peer);
}
const short kCheckboxColumnId = 1026;
@ -153,14 +156,14 @@ wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *p
kDataBrowserPropertyIsMutable
| kDataBrowserTableViewSelectionColumn
| kDataBrowserDefaultPropertyFlags;
err = AddColumn( &columnDesc, 0 );
verify_noerr( err );
}
wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()
{
}
class wxMacCheckListBoxItem : public wxMacListBoxItem
@ -170,15 +173,15 @@ public :
{
m_isChecked = false;
}
~wxMacCheckListBoxItem()
{
}
virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
bool changeValue )
bool changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported;
@ -218,7 +221,7 @@ public :
wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
event.SetInt( owner->GetLineFromItem( this ) );
event.SetEventObject( checklist );
checklist->GetEventHandler()->ProcessEvent( event );
checklist->GetEventHandler()->ProcessEvent( event );
}
break;
@ -233,35 +236,35 @@ public :
return err;
}
void Check( bool check )
void Check( bool check )
{
m_isChecked = check;
}
bool IsChecked() const
bool IsChecked() const
{
return m_isChecked;
return m_isChecked;
}
protected :
bool m_isChecked;
};
wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem()
wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem()
{
return new wxMacCheckListBoxItem();
}
void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)
void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)
{
wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
item->Check( bCheck);
UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
}
bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const
bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const
{
wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );
return item->IsChecked();
return item->IsChecked();
}

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

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)

View File

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

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)

View File

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

View File

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

View File

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

View File

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

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

View File

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

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>