Skip to content

V
vlc-1.1
Commit c4efd024 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Reverting to revision 12383 to 12340. This make wxwidgets 2.6.1 work but breaks older versions.

parent 98b9533c
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
modules/gui/wxwidgets/interface.cpp
View file @ c4efd024
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
void OnChange( wxMouseEvent& event ); void OnChange( wxMouseEvent& event );
void UpdateVolume(); void UpdateVolume();
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
wxVolCtrl *gauge; wxVolCtrl *gauge;
...@@ -1431,6 +1431,8 @@ void wxVolCtrl::UpdateVolume() ...@@ -1431,6 +1431,8 @@ void wxVolCtrl::UpdateVolume()
if( i_gauge_volume == GetValue() ) return; if( i_gauge_volume == GetValue() ) return;
SetValue( i_gauge_volume ); SetValue( i_gauge_volume );
SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"),
i_gauge_volume / 2 ) );
} }
#if defined(__WXGTK__) #if defined(__WXGTK__)
...@@ -1472,9 +1474,6 @@ void VLCVolCtrl::UpdateVolume() ...@@ -1472,9 +1474,6 @@ void VLCVolCtrl::UpdateVolume()
gauge->UpdateVolume(); gauge->UpdateVolume();
int i_volume = gauge->GetValue(); int i_volume = gauge->GetValue();
wxWindow::SetToolTip( (wxString)wxU(_("Volume")) +
wxString::Format( wxT(" %d"), i_volume/2 ) );
if( !!i_volume == !b_mute ) return; if( !!i_volume == !b_mute ) return;
b_mute = !b_mute; b_mute = !b_mute;
Refresh(); Refresh();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment