wxLongLongWx::Assign(double) works - thanks Guillermo

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5a6f3fe32869d95fbededc97359cbd6b15e46405..bd3124e1e179c048dbad6235b83690bb19373c50 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -109,7 +109,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
 
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );
 
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );

-    
+

 #ifndef __EMX__
     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );
 #ifndef __EMX__
     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );


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


@@ -244,14 +252,14 @@ void wxFileData::SetNewName( const wxString &name, const wxString &fname )
 void wxFileData::MakeItem( wxListItem &item )
 {
     item.m_text = m_name;
 void wxFileData::MakeItem( wxListItem &item )
 {
     item.m_text = m_name;

-    item.m_colour = wxBLACK;
-    if (IsExe()) item.m_colour = wxRED;
-    if (IsDir()) item.m_colour = wxBLUE;
-    if (IsDir()) item.m_image = 0; else item.m_image = -1;
+    item.ClearAttributes();
+    if (IsExe()) item.SetTextColour(*wxRED);
+    if (IsDir()) item.SetTextColour(*wxBLUE);
+    item.m_image = IsDir() ? 0 : -1;

     if (IsLink())
     {
         wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
     if (IsLink())
     {
         wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );

-        item.m_colour = dg;
+        item.SetTextColour(*dg);

     }
     item.m_data = (long)this;
 }
     }
     item.m_data = (long)this;
 }


@@ -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, 65 );

         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( 1, wxLIST_AUTOSIZE );
+    SetColumnWidth( 2, wxLIST_AUTOSIZE );
+    SetColumnWidth( 3, wxLIST_AUTOSIZE );

 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 }
 
 void wxFileCtrl::SetWild( const wxString &wild )


@@ -431,7 +443,7 @@ void wxFileCtrl::MakeDir()
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;

-    int id = Add( fd, item );
+    long id = Add( fd, item );

 
     if (id != -1)
     {
 
     if (id != -1)
     {


@@ -450,7 +462,7 @@ void wxFileCtrl::GoToParentDir()
         m_dirName = wxPathOnly( m_dirName );
         if (m_dirName.IsEmpty()) m_dirName = wxT("/");
         Update();
         m_dirName = wxPathOnly( m_dirName );
         if (m_dirName.IsEmpty()) m_dirName = wxT("/");
         Update();

-        int id = FindItem( 0, fname );
+        long id = FindItem( 0, fname );

         if (id != -1)
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
         if (id != -1)
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );


@@ -574,12 +586,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     m_message = message;
     m_dialogStyle = style;
 
     m_message = message;
     m_dialogStyle = style;

-    
+

     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))

-        m_dialogStyle &= ~wxMULTIPLE;
-    
+        m_dialogStyle |= wxOPEN;
+

     m_dir = defaultDir;
     m_dir = defaultDir;

-    if (m_dir.IsEmpty())
+    if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))

     {
         char buf[200];
         m_dir = getcwd( buf, sizeof(buf) );
     {
         char buf[200];
         m_dir = getcwd( buf, sizeof(buf) );


@@ -662,10 +674,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     if (m_dialogStyle & wxMULTIPLE)
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     if (m_dialogStyle & wxMULTIPLE)

-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, 
+        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,

                                 wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER );
     else
                                 wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER );
     else

-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, 
+        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,

                                 wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
                                 wxSize(440,180), wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 


@@ -715,14 +727,15 @@ wxFileDialog::~wxFileDialog()
 
 void wxFileDialog::OnChoice( wxCommandEvent &event )
 {
 
 void wxFileDialog::OnChoice( wxCommandEvent &event )
 {

-    wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() );
+    int index = (int)event.GetInt();
+    wxString *str = (wxString*) m_choice->GetClientData( index );

     m_list->SetWild( *str );
     m_list->SetWild( *str );

-    m_filterIndex = event.GetInt();
+    m_filterIndex = index;

 }
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {
 }
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {

-    m_list->ShowHidden( event.GetInt() );
+    m_list->ShowHidden( event.GetInt() != 0 );

 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )
 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )


@@ -740,16 +753,16 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 void wxFileDialog::OnSelected( wxListEvent &event )
 {
     if (FindFocus() != m_list) return;
 void wxFileDialog::OnSelected( wxListEvent &event )
 {
     if (FindFocus() != m_list) return;

-    
+

     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;
     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;

-    
+

     wxString dir;
     m_list->GetDir( dir );
     if (dir != wxT("/")) dir += wxT("/");
     dir += filename;
     if (wxDirExists(dir)) return;
     wxString dir;
     m_list->GetDir( dir );
     if (dir != wxT("/")) dir += wxT("/");
     dir += filename;
     if (wxDirExists(dir)) return;

-    
+

     m_text->SetValue( filename );
 }
 
     m_text->SetValue( filename );
 }
 


@@ -837,7 +850,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
     }
 
     SetPath( filename );
     }
 
     SetPath( filename );

-    
+

     wxCommandEvent event;
     wxDialog::OnOK(event);
 }
     wxCommandEvent event;
     wxDialog::OnOK(event);
 }


@@ -901,6 +914,12 @@ void wxFileDialog::SetPath( const wxString& path )
 void wxFileDialog::GetPaths( wxArrayString& paths ) const
 {
     paths.Empty();
 void wxFileDialog::GetPaths( wxArrayString& paths ) const
 {
     paths.Empty();

+    if (m_list->GetSelectedItemCount() == 0)
+    {
+        paths.Add( GetPath() );
+        return;
+    }
+

     paths.Alloc( m_list->GetSelectedItemCount() );
 
     wxString dir;
     paths.Alloc( m_list->GetSelectedItemCount() );
 
     wxString dir;


@@ -922,6 +941,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
     files.Empty();
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
     files.Empty();

+    if (m_list->GetSelectedItemCount() == 0)
+    {
+        files.Add( GetFilename() );
+        return;
+    }

     files.Alloc( m_list->GetSelectedItemCount() );
 
     wxListItem item;
     files.Alloc( m_list->GetSelectedItemCount() );
 
     wxListItem item;