vc6 did not like this (void function returning a value)

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index f85cf1d342d3d738860568b5cd77de8634e4d6ce..5427143e0121267ac1d39c42580bdc405979a05c 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -393,9 +393,6 @@ void wxFileData::MakeItem( wxListItem &item )
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 

-// FIXME: what is this for? It's never read
-static bool ignoreChanges = false;
-

 IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
 
 BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
 IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
 
 BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)


@@ -722,10 +719,8 @@ void wxFileListCtrl::GoToParentDir()
         long id = FindItem( 0, fname );
         if (id != wxNOT_FOUND)
         {
         long id = FindItem( 0, fname );
         if (id != wxNOT_FOUND)
         {

-            ignoreChanges = true;

             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );

-            ignoreChanges = false;

         }
     }
 }
         }
     }
 }


@@ -743,9 +738,7 @@ void wxFileListCtrl::GoToDir( const wxString &dir )
     m_dirName = dir;
     UpdateFiles();
 
     m_dirName = dir;
     UpdateFiles();
 

-    ignoreChanges = true;

     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );

-    ignoreChanges = false;

 
     EnsureVisible( 0 );
 }
 
     EnsureVisible( 0 );
 }


@@ -818,9 +811,7 @@ void wxFileListCtrl::OnListEndLabelEdit( wxListEvent &event )
     {
         fd->SetNewName( new_name, event.GetLabel() );
 
     {
         fd->SetNewName( new_name, event.GetLabel() );
 

-        ignoreChanges = true;

         SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
         SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );

-        ignoreChanges = false;

 
         UpdateItem( event.GetItem() );
         EnsureVisible( event.GetItem() );
 
         UpdateItem( event.GetItem() );
         EnsureVisible( event.GetItem() );