merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -557,7 +557,7 @@ void wxFileCtrl::Update()
res = wxFileNameFromPath( f );
fd = new wxFileData( res, f );
wxString s = fd->GetName();
if (m_showHidden || (s[0] != wxT('.')))
if (m_showHidden || (s[0u] != wxT('.')))
{
Add( fd, item );
item.m_itemId++;
@@ -572,7 +572,7 @@ void wxFileCtrl::Update()
res = wxFileNameFromPath( f );
fd = new wxFileData( res, f );
wxString s = fd->GetName();
if (m_showHidden || (s[0] != wxT('.')))
if (m_showHidden || (s[0u] != wxT('.')))
{
Add( fd, item );
item.m_itemId++;
@@ -582,9 +582,12 @@ void wxFileCtrl::Update()
SortItems( ListCompare, 0 );
SetColumnWidth( 1, wxLIST_AUTOSIZE );
SetColumnWidth( 2, wxLIST_AUTOSIZE );
SetColumnWidth( 3, wxLIST_AUTOSIZE );
if (my_style & wxLC_REPORT)
{
SetColumnWidth( 1, wxLIST_AUTOSIZE );
SetColumnWidth( 2, wxLIST_AUTOSIZE );
SetColumnWidth( 3, wxLIST_AUTOSIZE );
}
}
void wxFileCtrl::SetWild( const wxString &wild )
@@ -1023,7 +1026,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
return;
}
if (filename[0] == wxT('~'))
if (filename[0u] == wxT('~'))
{
filename.Remove( 0, 1 );
wxString tmp( wxGetUserHome() );
@@ -1045,7 +1048,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
}
if (dir != wxT("/")) dir += wxT("/");
if (filename[0] != wxT('/'))
if (filename[0u] != wxT('/'))
{
dir += filename;
filename = dir;