X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e1901b70e569df706866afb12aa5cf2b058963d..061896d126a09dc2c77e00950ba01223d7dddfa6:/src/generic/filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 2b482b1356..55da3ff5ff 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -140,7 +140,7 @@ int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
-#define IsTopMostDir(dir)   (dir.IsEmpty())
+#define IsTopMostDir(dir)   (dir.empty())
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
@@ -157,6 +157,7 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w
 
 wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
 {
+    Init();
     m_fileName = fileName;
     m_filePath = filePath;
     m_type = type;
@@ -165,6 +166,13 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
     ReadData();
 }
 
+void wxFileData::Init()
+{
+    m_size = 0;
+    m_type = wxFileData::is_file;
+    m_image = wxFileIconsTable::file;
+}
+
 void wxFileData::Copy( const wxFileData& fileData )
 {
     m_fileName = fileData.GetFileName();
@@ -173,7 +181,7 @@ void wxFileData::Copy( const wxFileData& fileData )
     m_dateTime = fileData.GetDateTime();
     m_permissions = fileData.GetPermissions();
     m_type = fileData.GetType();
-    m_image = GetImageId();
+    m_image = fileData.GetImageId();
 }
 
 void wxFileData::ReadData()
@@ -507,20 +515,20 @@ void wxFileCtrl::UpdateFiles()
 
 #if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
     if ( IsTopMostDir(m_dirName) )
-        {
+    {
         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)
-            {
+        {
             wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
             if (Add(fd, item) != -1)
                 item.m_itemId++;
             else
                 delete fd;
-            }
         }
+    }
     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {
@@ -529,7 +537,7 @@ void wxFileCtrl::UpdateFiles()
         {
             wxString p(wxPathOnly(m_dirName));
 #if defined(__UNIX__) && !defined(__OS2__)
-            if (p.IsEmpty()) p = wxT("/");
+            if (p.empty()) p = wxT("/");
 #endif // __UNIX__
             wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
             if (Add(fd, item) != -1)
@@ -660,18 +668,18 @@ void wxFileCtrl::GoToParentDir()
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-        if (!m_dirName.IsEmpty())
+        if (!m_dirName.empty())
         {
             if (m_dirName.Last() == wxT('.'))
                 m_dirName = wxEmptyString;
         }
 #elif defined(__UNIX__)
-        if (m_dirName.IsEmpty())
+        if (m_dirName.empty())
             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );
-        if (id != -1)
+        if (id != wxNOT_FOUND)
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
@@ -687,7 +695,7 @@ void wxFileCtrl::GoToHomeDir()
 
 void wxFileCtrl::GoToDir( const wxString &dir )
 {
-    if (!wxDirExists(dir)) return;
+    if (!wxPathExists(dir)) return;
 
     m_dirName = dir;
     UpdateFiles();
@@ -735,7 +743,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 
-    if ((event.GetLabel().IsEmpty()) ||
+    if ((event.GetLabel().empty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
@@ -870,32 +878,54 @@ END_EVENT_TABLE()
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 bool wxGenericFileDialog::ms_lastShowHidden = false;
 
+void wxGenericFileDialog::Init()
+{
+    m_bypassGenericImpl = false;
+
+    m_choice = NULL;
+    m_text   = NULL;
+    m_list   = NULL;
+    m_check  = NULL;
+    m_static = NULL;
+    m_upDirButton  = NULL;
+    m_newDirButton = NULL;
+}
+
 wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& message,
                            const wxString& defaultDir,
                            const wxString& defaultFile,
                            const wxString& wildCard,
-                           long style,
+                           long  style,
                            const wxPoint& pos,
-                           bool bypassGenericImpl )
-                    :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+                           bool  bypassGenericImpl ) : wxFileDialogBase()
 {
-    m_bypassGenericImpl = bypassGenericImpl;
-    
-    if (!m_bypassGenericImpl)
-        Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
+    Init();
+    Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, bypassGenericImpl );
 }
 
 bool wxGenericFileDialog::Create( wxWindow *parent,
-                           const wxString& message,
-                           const wxString& defaultDir,
-                           const wxString& defaultFile,
-                           const wxString& wildCard,
-                           long style,
-                           const wxPoint& pos )
+                                  const wxString& message,
+                                  const wxString& defaultDir,
+                                  const wxString& defaultFile,
+                                  const wxString& wildCard,
+                                  long  style,
+                                  const wxPoint& pos,
+                                  bool  bypassGenericImpl )
 {
+    m_bypassGenericImpl = bypassGenericImpl;
+
+    if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
+                                  wildCard, style, pos))
+    {
+        return false;
+    }
+
+    if (m_bypassGenericImpl)
+        return true;
+
     if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
-                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
     {
         return false;
     }
@@ -995,7 +1025,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,
-                             _T(""), ms_lastShowHidden,
+                             wxEmptyString, ms_lastShowHidden,
                              wxDefaultPosition, wxSize(540,200),
                              style2);
 
@@ -1049,7 +1079,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
     Centre( wxBOTH );
 
     m_text->SetFocus();
-    
+
     return true;
 }
 
@@ -1121,8 +1151,14 @@ void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
                                                     wildFilters);
     wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
 
-    m_choice->Clear();
-    for ( size_t n = 0; n < count; n++ )
+    const size_t countOld = m_choice->GetCount();
+    size_t n;
+    for ( n = 0; n < countOld; n++ )
+    {
+        delete (wxString *)m_choice->GetClientData(n);
+    }
+
+    for ( n = 0; n < count; n++ )
     {
         m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
     }
@@ -1189,7 +1225,7 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event )
     if (!IsTopMostDir(dir))
         dir += wxFILE_SEP_PATH;
     dir += filename;
-    if (wxDirExists(dir)) return;
+    if (wxPathExists(dir)) return;
 
     ignoreChanges = true;
     m_text->SetValue( filename );
@@ -1200,7 +1236,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();
-    if (filename.IsEmpty()) return;
+    if (filename.empty()) return;
     if (filename == wxT(".")) return;
 
     // "some/place/" means they want to chdir not try to load "place"
@@ -1251,7 +1287,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         filename = dir;
     }
 
-    if (wxDirExists(filename))
+    if (wxPathExists(filename))
     {
         m_list->GoToDir( filename );
         UpdateControls();