Backport 11235 to 0.8.2 - closes #87 for real

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index b34080ca068b7bc34ebf0499af6e7d9f3c3ac09c..edb49b117c40753b8b2b1a16cad4eca6c2893e8c 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -163,7 +163,8 @@ BEGIN_EVENT_TABLE(Playlist, wxFrame)
     EVT_BUTTON( Search_Event, Playlist::OnSearch)
     EVT_BUTTON( Save_Event, Playlist::OnSave)
 
-    EVT_TEXT(SearchText_Event, Playlist::OnSearchTextChange)
+    /*EVT_TEXT( SearchText_Event, Playlist::OnSearchTextChange )*/
+    EVT_TEXT_ENTER( SearchText_Event, Playlist::OnSearch )
 
     /* Custom events */
     EVT_COMMAND(-1, wxEVT_PLAYLIST, Playlist::OnPlaylistEvent)
@@ -986,10 +987,10 @@ void Playlist::OnSort( wxCommandEvent& event )
 /**********************************************************************
  * Search functions (user)
  **********************************************************************/
-void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
+/*void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
 {
    search_button->SetDefault();
-}
+}*/
 
 void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) )
 {

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index 931652b3c455816d654d274ccbcfce75f54c26ed..fcb5460fe9eeb22e0641044818cd4659e3532520 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -885,7 +885,7 @@ private:
 
     /* Search (user) */
     void OnSearch( wxCommandEvent& event );
-    void OnSearchTextChange( wxCommandEvent& event );
+    /*void OnSearchTextChange( wxCommandEvent& event );*/
     wxTextCtrl *search_text;
     wxButton *search_button;
     wxTreeItemId search_current;