Update bug in wxListCtrl,

  Y2000 bug in wxFileDialog (sic).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5edd8cc50ddd1642538d7a092b0ee97a0d1fcacb..909355ded63da70a3017b4e6de708facc693d523 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -133,6 +133,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     m_month = t->tm_mon+1;
     m_day = t->tm_mday;
     m_year = t->tm_year;
     m_month = t->tm_mon+1;
     m_day = t->tm_mday;
     m_year = t->tm_year;

+    m_year += 1900;

 
     m_permissions.sprintf( wxT("%c%c%c"),
      ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
 
     m_permissions.sprintf( wxT("%c%c%c"),
      ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),


@@ -181,30 +182,37 @@ wxString wxFileData::GetEntry( int num )
     switch (num)
     {
         case 0:
     switch (num)
     {
         case 0:

+        {

             s = m_name;
             s = m_name;

-            break;
+        }
+        break;

         case 1:
         case 1:

+        {   

             if (m_isDir) s = _("<DIR>");
             else if (m_isLink) s = _("<LINK>");
             else s = LongToString( m_size );
             if (m_isDir) s = _("<DIR>");
             else if (m_isLink) s = _("<LINK>");
             else s = LongToString( m_size );

-            break;
+        }
+        break;

         case 2:
         case 2:

+        {

             if (m_day < 10) s = wxT("0"); else s = wxT("");
             s += IntToString( m_day );
             s += wxT(".");
             if (m_month < 10) s += wxT("0");
             s += IntToString( m_month );
             s += wxT(".");
             if (m_day < 10) s = wxT("0"); else s = wxT("");
             s += IntToString( m_day );
             s += wxT(".");
             if (m_month < 10) s += wxT("0");
             s += IntToString( m_month );
             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("");
             s += IntToString( m_hour );
             s += wxT(":");
             if (m_minute < 10) s += wxT("0");
             s += IntToString( m_minute );
             break;
             if (m_hour < 10) s = wxT("0"); else s = wxT("");
             s += IntToString( m_hour );
             s += wxT(":");
             if (m_minute < 10) s += wxT("0");
             s += IntToString( m_minute );
             break;

+        }

         case 4:
             s = m_permissions;
             break;
         case 4:
             s = m_permissions;
             break;


@@ -339,7 +347,7 @@ void wxFileCtrl::Update()
     {
         InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
         InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
     {
         InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
         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( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
     }
         InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
         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 )

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index f70262c82d2a031b49f9cc769c0520ae9f37e915..3ea0fdc49aeea2864ecbac3691c192eb3fa00142 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -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;
 }