wxFileCtrl::Update was hiding wxWindow::Update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5630801c60932f99306ab2f3b9b615f02f03a268..6af187654a15bc2c18392076062050b35c9ccd39 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -144,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();


@@ -629,31 +629,31 @@ wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
     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 )


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

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

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


@@ -805,7 +805,7 @@ void wxFileCtrl::Update()
 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()


@@ -867,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)
         {


@@ -886,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 );
 }