Bug#749978: guayadeque: Much better patch

[Damyan Ivanov]

-=| Olly Betts, 14.08.2014 17:26:48 +1200 |=-
> Thanks for testing the previous patch.

You're welcome!

> This revised patch fixes the crash on pause/stop, turns off the 
> button borders so they appear as they do with wx2.8 and even fixes 
> the splash screen.

Confirmed.

Below is an additional patch that removes the border from progress 
controls in the status bar too. It also tries to remove the border 
around the search input in the media/radio tabs, but for some reason 
the result is still bordered controls.

Cheers and thanks again!
    dam


--- a/src/StatusBar.h
+++ b/src/StatusBar.h
@@ -46,7 +46,7 @@ class guGauge : public wxControl
   public :
     guGauge() : wxControl() { m_LastValue = wxNOT_FOUND; m_PaintWidth = 0; };
     guGauge( wxWindow * parent, const wxString &label = wxEmptyString, bool showporcent = true, wxWindowID id = wxID_ANY, unsigned int max = 100,
-               const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL );
+               const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxGA_HORIZONTAL | wxBORDER_NONE );
     ~guGauge( void );
 
     void    SetRange( int range );
--- a/src/MediaViewer.cpp
+++ b/src/MediaViewer.cpp
@@ -235,7 +235,7 @@ void guMediaViewer::CreateControls( void
     m_PlaylistsSelButton->SetToolTip( _( "Playlists" ) );
        TopSizer->Add( m_PlaylistsSelButton, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-       m_SearchTextCtrl = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+       m_SearchTextCtrl = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER | wxBORDER_NONE );
        TopSizer->Add( m_SearchTextCtrl, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 //////////////////////////
--- a/src/RadioPanel.cpp
+++ b/src/RadioPanel.cpp
@@ -560,7 +560,7 @@ guRadioPanel::guRadioPanel( wxWindow * p
     wxPanel * SearchPanel;
        SearchPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 
-    m_InputTextCtrl = new wxSearchCtrl( SearchPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    m_InputTextCtrl = new wxSearchCtrl( SearchPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER | wxBORDER_NONE );
     SearchSizer->Add( m_InputTextCtrl, 1, wxALIGN_CENTER, 5 );
 
     SearchPanel->SetSizer( SearchSizer );