Corrected bug in in revision 47973

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index d09c7eec536cd92f27e4c28fd0485beb1bbbfe24..e0525766a13af49bbb2d590246bb57fff342a19a 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_FILEDLG && (defined(__WXUNIVERSAL__) || defined(__WXGTK__))
+#if wxUSE_FILEDLG

 
 // NOTE : it probably also supports MAC, untested
 #if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
 
 // NOTE : it probably also supports MAC, untested
 #if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)


@@ -112,6 +112,11 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
     EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew)
     EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnOk)
     EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated)
     EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew)
     EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnOk)
     EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated)

+
+    EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+    EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 END_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 END_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;


@@ -328,7 +333,6 @@ wxGenericFileDialog::~wxGenericFileDialog()
 int wxGenericFileDialog::ShowModal()
 {
     m_filectrl->SetDirectory(m_dir);
 int wxGenericFileDialog::ShowModal()
 {
     m_filectrl->SetDirectory(m_dir);

-    UpdateControls();

 
     return wxDialog::ShowModal();
 }
 
     return wxDialog::ShowModal();
 }


@@ -340,7 +344,6 @@ bool wxGenericFileDialog::Show( bool show )
     if (show)
     {
         m_filectrl->SetDirectory(m_dir);
     if (show)
     {
         m_filectrl->SetDirectory(m_dir);

-        UpdateControls();

     }
 #endif
 
     }
 #endif
 


@@ -391,14 +394,12 @@ void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )
 {
     m_filectrl->GoToParentDir();
     m_filectrl->GetFileList()->SetFocus();
 {
     m_filectrl->GoToParentDir();
     m_filectrl->GetFileList()->SetFocus();

-    UpdateControls();

 }
 
 void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
 {
     m_filectrl->GoToHomeDir();
     m_filectrl->SetFocus();
 }
 
 void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
 {
     m_filectrl->GoToHomeDir();
     m_filectrl->SetFocus();

-    UpdateControls();

 }
 
 void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )


@@ -430,14 +431,9 @@ void wxGenericFileDialog::GetFilenames(wxArrayString& files) const
     m_filectrl->GetFilenames(files);
 }
 
     m_filectrl->GetFilenames(files);
 }
 

-void wxGenericFileDialog::UpdateControls()
+void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event)

 {
 {

-    const bool enable = !IsTopMostDir(m_filectrl->GetDirectory());
-    m_upDirButton->Enable(enable);
-
-#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-    m_newDirButton->Enable(enable);
-#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+    event.Enable( !IsTopMostDir(m_filectrl->GetDirectory()) );

 }
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 }
 
 #ifdef wxHAS_GENERIC_FILEDIALOG