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

Update bug in wxListCtrl,

Browse Source 
Y2000 bug in wxFileDialog (sic).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-04 15:32:14 +00:00
parent 98959adb03
commit d3e90957cf
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/filedlgg.cpp
View File

@@ -133,6 +133,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
m_month = t->tm_mon+1; m_month = t->tm_mon+1;
m_day = t->tm_mday; m_day = t->tm_mday;
m_year = t->tm_year; m_year = t->tm_year;
m_year += 1900;
m_permissions.sprintf( wxT("%c%c%c"), m_permissions.sprintf( wxT("%c%c%c"),
((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')), ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
@@ -181,30 +182,37 @@ wxString wxFileData::GetEntry( int num )
switch (num) switch (num)
{ {
case 0: case 0:
{
s = m_name; s = m_name;
break; }
break;
case 1: case 1:
{
if (m_isDir) s = _("<DIR>"); if (m_isDir) s = _("<DIR>");
else if (m_isLink) s = _("<LINK>"); else if (m_isLink) s = _("<LINK>");
else s = LongToString( m_size ); else s = LongToString( m_size );
break; }
break;
case 2: case 2:
{
if (m_day < 10) s = wxT("0"); else s = wxT(""); if (m_day < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_day ); s += IntToString( m_day );
s += wxT("."); s += wxT(".");
if (m_month < 10) s += wxT("0"); if (m_month < 10) s += wxT("0");
s += IntToString( m_month ); s += IntToString( m_month );
s += wxT("."); s += wxT(".");
if (m_year < 10) s += wxT("0"); // this should happen real soon...
s += IntToString( m_year ); s += IntToString( m_year );
break; }
break;
case 3: case 3:
{
if (m_hour < 10) s = wxT("0"); else s = wxT(""); if (m_hour < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_hour ); s += IntToString( m_hour );
s += wxT(":"); s += wxT(":");
if (m_minute < 10) s += wxT("0"); if (m_minute < 10) s += wxT("0");
s += IntToString( m_minute ); s += IntToString( m_minute );
break; break;
}
case 4: case 4:
s = m_permissions; s = m_permissions;
break; break;
@@ -339,7 +347,7 @@ void wxFileCtrl::Update()
{ {
InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 ); InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 ); InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 55 ); InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 70 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 ); InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 ); InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
} }
@@ -388,6 +396,10 @@ void wxFileCtrl::Update()
} }
SortItems( ListCompare, 0 ); SortItems( ListCompare, 0 );
SetColumnWidth( 2, wxLIST_AUTOSIZE );
SetColumnWidth( 3, wxLIST_AUTOSIZE );
SetColumnWidth( 4, wxLIST_AUTOSIZE );
} }
void wxFileCtrl::SetWild( const wxString &wild ) void wxFileCtrl::SetWild( const wxString &wild )

3
src/generic/listctrl.cpp
View File

@@ -3107,7 +3107,10 @@ long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
long wxListCtrl::InsertColumn( long col, wxListItem &item ) long wxListCtrl::InsertColumn( long col, wxListItem &item )
{ {
wxASSERT( m_headerWin );
m_mainWin->InsertColumn( col, item ); m_mainWin->InsertColumn( col, item );
m_headerWin->Refresh();
return 0; return 0;
} }