Added shared private declarations header privx.h, utils.cpp now shared

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9d05013d6c7676de932a73f70745504b6b22c330..6af187654a15bc2c18392076062050b35c9ccd39 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -69,6 +69,9 @@
 # include <time.h>
 #include <unistd.h>
 
 # include <time.h>
 #include <unistd.h>
 

+// XPM hack: make the arrays const
+#define static static const
+

 #ifndef __DOS__
 #include "wx/generic/home.xpm"
 #endif
 #ifndef __DOS__
 #include "wx/generic/home.xpm"
 #endif


@@ -80,26 +83,14 @@
 #include "wx/generic/deffile.xpm"
 #include "wx/generic/exefile.xpm"
 
 #include "wx/generic/deffile.xpm"
 #include "wx/generic/exefile.xpm"
 

+#undef static
+

 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 
 class wxFileData : public wxObject
 {
 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 
 class wxFileData : public wxObject
 {

-private:
-    wxString m_name;
-    wxString m_fileName;
-    long     m_size;
-    int      m_hour;
-    int      m_minute;
-    int      m_year;
-    int      m_month;
-    int      m_day;
-    wxString m_permissions;
-    bool     m_isDir;
-    bool     m_isLink;
-    bool     m_isExe;
-

 public:
     wxFileData() { }
     wxFileData( const wxString &name, const wxString &fname );
 public:
     wxFileData() { }
     wxFileData( const wxString &name, const wxString &fname );


@@ -115,6 +106,19 @@ public:
     void SetNewName( const wxString &name, const wxString &fname );
 
 private:
     void SetNewName( const wxString &name, const wxString &fname );
 
 private:

+    wxString m_name;
+    wxString m_fileName;
+    long     m_size;
+    int      m_hour;
+    int      m_minute;
+    int      m_year;
+    int      m_month;
+    int      m_day;
+    wxString m_permissions;
+    bool     m_isDir;
+    bool     m_isLink;
+    bool     m_isExe;
+

     DECLARE_DYNAMIC_CLASS(wxFileData);
 };
 
     DECLARE_DYNAMIC_CLASS(wxFileData);
 };
 


@@ -124,11 +128,6 @@ private:
 
 class wxFileCtrl : public wxListCtrl
 {
 
 class wxFileCtrl : public wxListCtrl
 {

-private:
-    wxString      m_dirName;
-    bool          m_showHidden;
-    wxString      m_wild;
-

 public:
     wxFileCtrl();
     wxFileCtrl( wxWindow *win,
 public:
     wxFileCtrl();
     wxFileCtrl( wxWindow *win,


@@ -145,7 +144,7 @@ public:
     void ChangeToIconMode();
     void ShowHidden( bool show = TRUE );
     long Add( wxFileData *fd, wxListItem &item );
     void ChangeToIconMode();
     void ShowHidden( bool show = TRUE );
     long Add( wxFileData *fd, wxListItem &item );

-    void Update();
+    void UpdateFiles();

     virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
     void MakeDir();
     void GoToParentDir();
     virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
     void MakeDir();
     void GoToParentDir();


@@ -156,8 +155,21 @@ public:
     void OnListDeleteItem( wxListEvent &event );
     void OnListDeleteAllItems( wxListEvent &event );
     void OnListEndLabelEdit( wxListEvent &event );
     void OnListDeleteItem( wxListEvent &event );
     void OnListDeleteAllItems( wxListEvent &event );
     void OnListEndLabelEdit( wxListEvent &event );

+    
+    // Associate commonly used UI controls with wxFileCtrl so that they can be
+    // disabled when they cannot be used (e.g. can't go to parent directory
+    // if wxFileCtrl already is in the root dir):
+    void SetGoToParentControl(wxWindow *ctrl) { m_goToParentControl = ctrl; }
+    void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }

 
 private:
 
 private:

+    wxString      m_dirName;
+    bool          m_showHidden;
+    wxString      m_wild;
+    
+    wxWindow     *m_goToParentControl;
+    wxWindow     *m_newDirControl;
+

     DECLARE_DYNAMIC_CLASS(wxFileCtrl);
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxFileCtrl);
     DECLARE_EVENT_TABLE()
 };


@@ -383,6 +395,10 @@ int ListCompare( long data1, long data2, long WXUNUSED(data) )
 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 
 #define IsTopMostDir(dir)   (dir.IsEmpty())
 #endif
 

+#if defined(__DOS__) || defined(__WINDOWS__)
+extern bool wxIsDriveAvailable(const wxString& dirName);
+#endif
+

 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------


@@ -393,9 +409,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
 {
     m_name = name;
     m_fileName = fname;
 {
     m_name = name;
     m_fileName = fname;

+    
+#if defined(__DOS__) || defined(__WINDOWS__)
+    // VS: In case the file is root directory of a volume (e.g. "C:"),
+    //     we don't want it stat()ed, since the drive may not be in:
+    if (name.length() == 2 && name[1u] == wxT(':'))
+    {
+        m_isDir = TRUE;
+        m_isExe = m_isLink = FALSE;
+        m_size = 0;
+        return;
+    }
+#endif

 
     struct stat buff;
 
     struct stat buff;

-    stat( m_fileName.fn_str(), &buff );
+    wxStat( m_fileName.fn_str(), &buff );

 
 #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
     struct stat lbuff;
 
 #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
     struct stat lbuff;


@@ -548,7 +576,7 @@ void wxFileData::MakeItem( wxListItem &item )
     else if (IsExe())
         item.m_image = FI_EXECUTABLE;
     else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
     else if (IsExe())
         item.m_image = FI_EXECUTABLE;
     else if (m_name.Find(wxT('.')) != wxNOT_FOUND)

-        item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
+        item.m_image = g_IconsTable->GetIconID(m_name.AfterLast(wxT('.')));

     else
         item.m_image = FI_UNKNOWN;
 
     else
         item.m_image = FI_UNKNOWN;
 


@@ -592,38 +620,40 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
 {
     if (! g_IconsTable) 
         g_IconsTable = new wxFileIconsTable;
 {
     if (! g_IconsTable) 
         g_IconsTable = new wxFileIconsTable;

-    wxImageList *imageList = g_IconsTable -> GetImageList();
+    wxImageList *imageList = g_IconsTable->GetImageList();

 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 
 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 

+    m_goToParentControl = m_newDirControl = NULL;
+

     m_dirName = dirName;
     m_wild = wild;
     m_showHidden = FALSE;
     m_dirName = dirName;
     m_wild = wild;
     m_showHidden = FALSE;

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::ChangeToListMode()
 {
     SetSingleStyle( wxLC_LIST );
 }
 
 void wxFileCtrl::ChangeToListMode()
 {
     SetSingleStyle( wxLC_LIST );

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::ChangeToReportMode()
 {
     SetSingleStyle( wxLC_REPORT );
 }
 
 void wxFileCtrl::ChangeToReportMode()
 {
     SetSingleStyle( wxLC_REPORT );

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::ChangeToIconMode()
 {
     SetSingleStyle( wxLC_ICON );
 }
 
 void wxFileCtrl::ChangeToIconMode()
 {
     SetSingleStyle( wxLC_ICON );

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;
 }
 
 void wxFileCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;

-    Update();
+    UpdateFiles();

 }
 
 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 }
 
 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )


@@ -650,8 +680,10 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
     return ret;
 }
 
     return ret;
 }
 

-void wxFileCtrl::Update()
+void wxFileCtrl::UpdateFiles()

 {
 {

+    wxBusyCursor bcur; // this may take a while...
+    

     long my_style = GetWindowStyleFlag();
     int name_col_width = 0;
     if (my_style & wxLC_REPORT)
     long my_style = GetWindowStyleFlag();
     int name_col_width = 0;
     if (my_style & wxLC_REPORT)


@@ -678,15 +710,21 @@ void wxFileCtrl::Update()
     item.m_col = 0;
 
 #if defined(__DOS__) || defined(__WINDOWS__)
     item.m_col = 0;
 
 #if defined(__DOS__) || defined(__WINDOWS__)

-    if ( m_dirName.IsEmpty() )
+    if ( IsTopMostDir(m_dirName) )

     {   
         // Pseudo-directory with all available drives listed...
     {   
         // Pseudo-directory with all available drives listed...

-        fd = new wxFileData( wxT("C:"), "C:" );
-        Add( fd, item );
-        item.m_itemId++;
-        fd = new wxFileData( wxT("D:"), "D:" );
-        Add( fd, item );
-        item.m_itemId++;
+        for (int drive = 1; drive <= 26; drive++)
+        {
+            wxString path;
+            path.Printf(wxT("%c:\\"), (char)(drive + 'A' - 1));
+            if ( wxIsDriveAvailable(path) )
+            {
+                path.RemoveLast();
+                fd = new wxFileData(path, path);
+                Add(fd, item);
+                item.m_itemId++;
+            }
+        }

     }
     else
 #endif
     }
     else
 #endif


@@ -754,12 +792,20 @@ void wxFileCtrl::Update()
        SetColumnWidth(2, wxLIST_AUTOSIZE);
        SetColumnWidth(3, wxLIST_AUTOSIZE);
     }
        SetColumnWidth(2, wxLIST_AUTOSIZE);
        SetColumnWidth(3, wxLIST_AUTOSIZE);
     }

+    
+    // Finally, enable/disable context-dependent controls:
+    if ( m_goToParentControl )
+        m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
+#if defined(__DOS__) || defined(__WINDOWS__)
+    if ( m_newDirControl )
+        m_newDirControl->Enable(!IsTopMostDir(m_dirName));
+#endif

 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 {
     m_wild = wild;
 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 {
     m_wild = wild;

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::MakeDir()
 }
 
 void wxFileCtrl::MakeDir()


@@ -821,7 +867,7 @@ void wxFileCtrl::GoToParentDir()
         if (m_dirName.IsEmpty()) 
             m_dirName = wxT("/");
 #endif
         if (m_dirName.IsEmpty()) 
             m_dirName = wxT("/");
 #endif

-        Update();
+        UpdateFiles();

         long id = FindItem( 0, fname );
         if (id != -1)
         {
         long id = FindItem( 0, fname );
         if (id != -1)
         {


@@ -840,7 +886,7 @@ void wxFileCtrl::GoToHomeDir()
 void wxFileCtrl::GoToDir( const wxString &dir )
 {
     m_dirName = dir;
 void wxFileCtrl::GoToDir( const wxString &dir )
 {
     m_dirName = dir;

-    Update();
+    UpdateFiles();

     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );
 }
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );
 }


@@ -959,7 +1005,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                  const wxPoint& pos ) :
   wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
 {
                  const wxPoint& pos ) :
   wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
 {

-    wxBeginBusyCursor();
+    wxBusyCursor bcur;

 
     if (wxConfig::Get(FALSE))
     {
 
     if (wxConfig::Get(FALSE))
     {


@@ -1039,13 +1085,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     buttonsizer->Add( 30, 5, 1 );
 
 
     buttonsizer->Add( 30, 5, 1 );
 

-    but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
+    wxWindow *butDirUp = 
+        new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    but->SetToolTip( _("Go to parent directory") );
+    butDirUp->SetToolTip( _("Go to parent directory") );

 #endif
 #endif

-    buttonsizer->Add( but, 0, wxALL, 5 );
+    buttonsizer->Add( butDirUp, 0, wxALL, 5 );

 
 

-#ifndef __DOS__ // VS: Home directory is senseless in MS-DOS...
+#ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...

     but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
     but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );


@@ -1055,11 +1102,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 

-    but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
+    wxWindow *butNewDir = 
+        new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    but->SetToolTip( _("Create new directory") );
+    butNewDir->SetToolTip( _("Create new directory") );

 #endif
 #endif

-    buttonsizer->Add( but, 0, wxALL, 5 );
+    buttonsizer->Add( butNewDir, 0, wxALL, 5 );

 
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
 
 
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
 


@@ -1075,7 +1123,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     else
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
                                  wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
     else
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
                                  wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );

-    m_list -> ShowHidden(s_lastShowHidden);
+    m_list->ShowHidden(s_lastShowHidden);
+    m_list->SetNewDirControl(butNewDir);
+    m_list->SetGoToParentControl(butDirUp);
+    

     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );


@@ -1116,8 +1167,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     else
 */
         m_text->SetFocus();
     else
 */
         m_text->SetFocus();

-
-    wxEndBusyCursor();

 }
 
 wxFileDialog::~wxFileDialog()
 }
 
 wxFileDialog::~wxFileDialog()