Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 0f62d9a1e240a1dc9e7d886175637f98d4507865..d74c7aadc07595ddae6e05b36f3298b1bbb42e90 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -28,15 +28,18 @@
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/button.h"
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/button.h"

+    #include "wx/checkbox.h"

     #include "wx/sizer.h"
     #include "wx/sizer.h"

-    #include "wx/statline.h"

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
 #endif
 
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
 #endif
 

+#include "wx/statline.h"

 #include "wx/generic/dirctrlg.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/generic/dirctrlg.h"
 #include "wx/generic/dirdlgg.h"

+#include "wx/artprov.h"
+#include "wx/bmpbuttn.h"

 
 //-----------------------------------------------------------------------------
 // wxGenericDirDialog
 
 //-----------------------------------------------------------------------------
 // wxGenericDirDialog


@@ -47,15 +50,18 @@ static const int ID_TEXTCTRL = 1001;
 static const int ID_OK = 1002;
 static const int ID_CANCEL = 1003;
 static const int ID_NEW = 1004;
 static const int ID_OK = 1002;
 static const int ID_CANCEL = 1003;
 static const int ID_NEW = 1004;

-//static const int ID_CHECK = 1005;
+static const int ID_SHOW_HIDDEN = 1005;
+static const int ID_GO_HOME = 1006;

 
 BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)

-    EVT_BUTTON               (wxID_OK,  wxGenericDirDialog::OnOK)
-    EVT_BUTTON               (wxID_NEW,     wxGenericDirDialog::OnNew)

     EVT_CLOSE                (wxGenericDirDialog::OnCloseWindow)
     EVT_CLOSE                (wxGenericDirDialog::OnCloseWindow)

-    EVT_TREE_KEY_DOWN        (-1,   wxGenericDirDialog::OnTreeKeyDown)
-    EVT_TREE_SEL_CHANGED     (-1,   wxGenericDirDialog::OnTreeSelected)
-    EVT_TEXT_ENTER           (ID_TEXTCTRL,  wxGenericDirDialog::OnOK)
+    EVT_BUTTON               (wxID_OK,        wxGenericDirDialog::OnOK)
+    EVT_BUTTON               (ID_NEW,         wxGenericDirDialog::OnNew)
+    EVT_BUTTON               (ID_GO_HOME,     wxGenericDirDialog::OnGoHome)
+    EVT_TREE_KEY_DOWN        (-1,             wxGenericDirDialog::OnTreeKeyDown)
+    EVT_TREE_SEL_CHANGED     (-1,             wxGenericDirDialog::OnTreeSelected)
+    EVT_TEXT_ENTER           (ID_TEXTCTRL,    wxGenericDirDialog::OnOK)
+    EVT_CHECKBOX             (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden)

 END_EVENT_TABLE()
 
 wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 END_EVENT_TABLE()
 
 wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,


@@ -68,20 +74,67 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 
     m_path = defaultPath;
     if (m_path == wxT("~"))
 
     m_path = defaultPath;
     if (m_path == wxT("~"))

-        wxGetHomeDir( &m_path );
+        wxGetHomeDir(&m_path);
+    if (m_path == wxT("."))
+        m_path = wxGetCwd();

 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

+    // 0) 'New' and 'Home' Buttons
+    wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    // VS: 'Home directory' concept is unknown to MS-DOS
+#ifndef __DOS__
+    wxBitmapButton* homeButton = 
+        new wxBitmapButton(this, ID_GO_HOME,
+                           wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));
+    buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 );
+#endif
+    
+    // I'm not convinced we need a New button, and we tend to get annoying
+    // accidental-editing with label editing enabled.
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        wxBitmapButton* newButton = 
+            new wxBitmapButton(this, ID_NEW,
+                            wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+        buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+#if wxUSE_TOOLTIPS
+        newButton->SetToolTip(_("Create new directory"));
+#endif    
+    }
+
+#if wxUSE_TOOLTIPS
+    homeButton->SetToolTip(_("Go to home directory"));
+#endif
+
+    topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
+

     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from 
                       // wxGenericDirCtrl would crash otherwise!
     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from 
                       // wxGenericDirCtrl would crash otherwise!

+    long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER;
+    
+#ifdef __WXMSW__
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
+        // before we can call EditLabel (required for "New directory")
+        dirStyle |= wxDIRCTRL_EDIT_LABELS;
+    }
+#endif    
+

     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
                                      m_path, wxPoint(5, 5),
                                      wxSize(300, 200), 
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
                                      m_path, wxPoint(5, 5),
                                      wxSize(300, 200), 

-                                     wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);
+                                     dirStyle);

 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
 
 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
 

+    // Make the an option depending on a flag?
+    wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
+    topsizer->Add( check, 0, wxLEFT|wxTOP | wxALIGN_RIGHT, 5 );
+

     // 2) text ctrl
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
     topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
     // 2) text ctrl
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
     topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );


@@ -92,18 +145,15 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 #endif
 
     // 4) Buttons
 #endif
 
     // 4) Buttons

-    wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+    buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+    
+    // OK and Cancel button should be at the right bottom

     wxButton* okButton = new wxButton(this, wxID_OK, _("OK"));
     buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
     wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
     buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
 
     wxButton* okButton = new wxButton(this, wxID_OK, _("OK"));
     buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
     wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
     buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
 

-    // I'm not convinced we need a New button, and we tend to get annoying
-    // accidental-editing with label editing enabled.
-    wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") );
-    buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 );
-
-    topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
+    topsizer->Add( buttonsizer, 0, wxALL | wxALIGN_RIGHT, 10 );

 
     okButton->SetDefault();
     m_dirCtrl->SetFocus();
 
     okButton->SetDefault();
     m_dirCtrl->SetFocus();


@@ -195,6 +245,14 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
         m_input->SetValue( data->m_path );
 };
 
         m_input->SetValue( data->m_path );
 };
 

+void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event )
+{
+    if (!m_dirCtrl)
+        return;
+
+    m_dirCtrl->ShowHidden( event.GetInt() );
+}
+

 void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
 {
     wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
 void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
 {
     wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();


@@ -251,4 +309,9 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
     m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
 }
 
     m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
 }
 

+void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event))
+{
+    SetPath(wxGetUserHome());
+}
+

 #endif // wxUSE_DIRDLG
 #endif // wxUSE_DIRDLG