concentrating content and structure region calculations

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 71eaa00fef32a706829503199541a3168d8bff2d..83c51c893efc9b138dc180f3ebfd02d1be2c92e8 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////

 // Name:        filedlgg.cpp
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Name:        filedlgg.cpp
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling


@@ -23,7 +23,7 @@
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested

-#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__)
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)

 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 
 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 


@@ -82,7 +82,7 @@
 // ----------------------------------------------------------------------------
 
 static
 // ----------------------------------------------------------------------------
 
 static

-int wxFileDataNameCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -94,7 +94,7 @@ int wxFileDataNameCompare( long data1, long data2, long data)
 }
 
 static
 }
 
 static

-int wxFileDataSizeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -108,7 +108,7 @@ int wxFileDataSizeCompare( long data1, long data2, long data)
 }
 
 static
 }
 
 static

-int wxFileDataTypeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -122,7 +122,7 @@ int wxFileDataTypeCompare( long data1, long data2, long data)
 }
 
 static
 }
 
 static

-int wxFileDataTimeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -134,11 +134,11 @@ int wxFileDataTimeCompare( long data1, long data2, long data)
      return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
 }
 
      return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
 }
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__OS2__)

 #define IsTopMostDir(dir)   (dir == wxT("/"))
 #endif
 
 #define IsTopMostDir(dir)   (dir == wxT("/"))
 #endif
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)

 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 
 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 


@@ -154,17 +154,6 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w
 //  wxFileData
 //-----------------------------------------------------------------------------
 
 //  wxFileData
 //-----------------------------------------------------------------------------
 

-wxFileData::wxFileData( const wxFileData& fileData )
-{
-    m_fileName = fileData.GetFileName();
-    m_filePath = fileData.GetFilePath();
-    m_size = fileData.GetSize();
-    m_dateTime = fileData.GetDateTime();
-    m_permissions = fileData.GetPermissions();
-    m_type = fileData.GetType();
-    m_image = GetImageId();
-}
-

 wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
 {
     m_fileName = fileName;
 wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
 {
     m_fileName = fileName;


@@ -175,6 +164,17 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
     ReadData();
 }
 
     ReadData();
 }
 

+void wxFileData::Copy( const wxFileData& fileData )
+{
+    m_fileName = fileData.GetFileName();
+    m_filePath = fileData.GetFilePath();
+    m_size = fileData.GetSize();
+    m_dateTime = fileData.GetDateTime();
+    m_permissions = fileData.GetPermissions();
+    m_type = fileData.GetType();
+    m_image = GetImageId();
+}
+

 void wxFileData::ReadData()
 {
     if (IsDrive())
 void wxFileData::ReadData()
 {
     if (IsDrive())


@@ -183,7 +183,7 @@ void wxFileData::ReadData()
         return;
     }
 
         return;
     }
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

     // c:\.. is a drive don't stat it
     if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))
     {
     // c:\.. is a drive don't stat it
     if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))
     {


@@ -195,7 +195,7 @@ void wxFileData::ReadData()
 
     wxStructStat buff;
 
 
     wxStructStat buff;
 

-#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
+#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))

     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
 #else // no lstat()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
 #else // no lstat()


@@ -208,10 +208,13 @@ void wxFileData::ReadData()
     // try to get a better icon
     if (m_image == wxFileIconsTable::file)
     {
     // try to get a better icon
     if (m_image == wxFileIconsTable::file)
     {

-        if (IsExe())
+        if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
+       {
+            m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
+       } else if (IsExe())
+       {

             m_image = wxFileIconsTable::executable;
             m_image = wxFileIconsTable::executable;

-        else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
-            m_image = wxTheFileIconsTable->GetIconID(m_fileName.AfterLast(wxT('.')));
+       }

     }
 
     m_size = buff.st_size;
     }
 
     m_size = buff.st_size;


@@ -343,8 +346,9 @@ void wxFileData::MakeItem( wxListItem &item )
 
     if (IsLink())
     {
 
     if (IsLink())
     {

-        wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") );
-        item.SetTextColour(*dg);
+        wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") );
+        if ( dg.Ok() )
+            item.SetTextColour(dg);

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


@@ -357,6 +361,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)

+    EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)

     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
     EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick)
 END_EVENT_TABLE()
     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
     EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick)
 END_EVENT_TABLE()


@@ -487,15 +492,13 @@ void wxFileCtrl::UpdateFiles()
 
     wxBusyCursor bcur; // this may take a while...
 
 
     wxBusyCursor bcur; // this may take a while...
 

-    FreeAllItemsData();

     DeleteAllItems();
 
     DeleteAllItems();
 

-    wxFileData *fd = (wxFileData *) NULL;

     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
 
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
 

-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)

     if ( IsTopMostDir(m_dirName) )
         {
         wxArrayString names, paths;
     if ( IsTopMostDir(m_dirName) )
         {
         wxArrayString names, paths;


@@ -504,9 +507,11 @@ void wxFileCtrl::UpdateFiles()
 
         for (n=0; n<count; n++)
             {
 
         for (n=0; n<count; n++)
             {

-            fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
-                Add(fd, item);
+            wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
+            if (Add(fd, item) != -1)

                 item.m_itemId++;
                 item.m_itemId++;

+            else
+                delete fd;

             }
         }
     else
             }
         }
     else


@@ -516,19 +521,21 @@ void wxFileCtrl::UpdateFiles()
         if ( !IsTopMostDir(m_dirName) )
         {
             wxString p(wxPathOnly(m_dirName));
         if ( !IsTopMostDir(m_dirName) )
         {
             wxString p(wxPathOnly(m_dirName));

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__OS2__)

             if (p.IsEmpty()) p = wxT("/");
 #endif // __UNIX__
             if (p.IsEmpty()) p = wxT("/");
 #endif // __UNIX__

-            fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
-            Add(fd, item);
+            wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
+            if (Add(fd, item) != -1)

             item.m_itemId++;
             item.m_itemId++;

+            else
+                delete fd;

         }
 
         wxString dirname(m_dirName);
         }
 
         wxString dirname(m_dirName);

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

         if (dirname.length() == 2 && dirname[1u] == wxT(':'))
             dirname << wxT('\\');
         if (dirname.length() == 2 && dirname[1u] == wxT(':'))
             dirname << wxT('\\');

-#endif // defined(__DOS__) || defined(__WINDOWS__)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

         wxDir dir(dirname);
 
         if ( dir.IsOpened() )
         wxDir dir(dirname);
 
         if ( dir.IsOpened() )


@@ -546,9 +553,12 @@ void wxFileCtrl::UpdateFiles()
             cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
             while (cont)
             {
             cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
             while (cont)
             {

-                fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
-                Add(fd, item);
+                wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
+                if (Add(fd, item) != -1)

                 item.m_itemId++;
                 item.m_itemId++;

+                else
+                    delete fd;
+

                 cont = dir.GetNext(&f);
             }
 
                 cont = dir.GetNext(&f);
             }
 


@@ -561,9 +571,12 @@ void wxFileCtrl::UpdateFiles()
                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {
                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {

-                    fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
-                    Add(fd, item);
+                    wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
+                    if (Add(fd, item) != -1)

                     item.m_itemId++;
                     item.m_itemId++;

+                    else
+                        delete fd;
+

                     cont = dir.GetNext(&f);
                 }
             }
                     cont = dir.GetNext(&f);
                 }
             }


@@ -626,6 +639,8 @@ void wxFileCtrl::MakeDir()
         EnsureVisible( id );
         EditLabel( id );
     }
         EnsureVisible( id );
         EditLabel( id );
     }

+    else
+        delete fd;

 }
 
 void wxFileCtrl::GoToParentDir()
 }
 
 void wxFileCtrl::GoToParentDir()


@@ -637,7 +652,7 @@ void wxFileCtrl::GoToParentDir()
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

         if (!m_dirName.IsEmpty())
         {
             if (m_dirName.Last() == wxT('.'))
         if (!m_dirName.IsEmpty())
         {
             if (m_dirName.Last() == wxT('.'))


@@ -673,10 +688,15 @@ void wxFileCtrl::GoToDir( const wxString &dir )
     EnsureVisible( 0 );
 }
 
     EnsureVisible( 0 );
 }
 

-void wxFileCtrl::FreeItemData(const wxListItem& item)
+void wxFileCtrl::FreeItemData(wxListItem& item)

 {
 {

-    wxFileData *fd = (wxFileData*)item.m_data;
-    delete fd;
+    if ( item.m_data )
+    {
+        wxFileData *fd = (wxFileData*)item.m_data;
+        delete fd;
+
+        item.m_data = 0;
+    }

 }
 
 void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
 }
 
 void wxFileCtrl::OnListDeleteItem( wxListEvent &event )


@@ -684,6 +704,11 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
     FreeItemData(event.m_item);
 }
 
     FreeItemData(event.m_item);
 }
 

+void wxFileCtrl::OnListDeleteAllItems( wxListEvent &event )
+{
+    FreeAllItemsData();
+}
+

 void wxFileCtrl::FreeAllItemsData()
 {
     wxListItem item;
 void wxFileCtrl::FreeAllItemsData()
 {
     wxListItem item;


@@ -797,7 +822,6 @@ void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
 
 wxFileCtrl::~wxFileCtrl()
 {
 
 wxFileCtrl::~wxFileCtrl()
 {

-    FreeAllItemsData();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -958,19 +982,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 

-        wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
-        m_choice = new wxChoice( this, ID_CHOICE );
-        choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
-        mainsizer->Add( choicesizer, 0, wxEXPAND );
-

         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
         textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
         textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 

-        m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
-        m_check->SetValue( ms_lastShowHidden );
-        textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
+        m_check = NULL;
+        m_choice = new wxChoice( this, ID_CHOICE );
+        textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );

 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );
         buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );
         buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );


@@ -1040,6 +1059,18 @@ int wxGenericFileDialog::ShowModal()
     return wxDialog::ShowModal();
 }
 
     return wxDialog::ShowModal();
 }
 

+bool wxGenericFileDialog::Show( bool show )
+{
+    if (show)
+    {
+        m_list->GoToDir(m_dir);
+        UpdateControls();
+        m_text->SetValue(m_fileName);
+    }
+
+    return wxDialog::Show( show );
+}
+

 void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 {
     wxString *str = (wxString*) m_choice->GetClientData( filterindex );
 void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 {
     wxString *str = (wxString*) m_choice->GetClientData( filterindex );


@@ -1230,7 +1261,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 

-        if ( cwd != wxGetWorkingDirectory() )
+        if ( cwd != wxGetCwd() )

         {
             wxSetWorkingDirectory(cwd);
         }
         {
             wxSetWorkingDirectory(cwd);
         }


@@ -1355,9 +1386,9 @@ void wxGenericFileDialog::UpdateControls()
     bool enable = !IsTopMostDir(dir);
     m_upDirButton->Enable(enable);
 
     bool enable = !IsTopMostDir(dir);
     m_upDirButton->Enable(enable);
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

     m_newDirButton->Enable(enable);
     m_newDirButton->Enable(enable);

-#endif // defined(__DOS__) || defined(__WINDOWS__)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 }
 
 #ifdef USE_GENERIC_FILEDIALOG
 }
 
 #ifdef USE_GENERIC_FILEDIALOG