Menu/toolbar event handling now tries the window with the focus first.

[wxWidgets.git] / src / msw / slider95.cpp

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index b06bc4aaaa753faf2efd050b17ce72e80aa4eda4..d7a322184a38da34fc40527907836a98c4ecdea8 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -37,17 +37,10 @@
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
-
-BEGIN_EVENT_TABLE(wxSlider95, wxControl)
-#if WXWIN_COMPATIBILITY
-  EVT_SCROLL(wxSlider95::OnScroll)
-#endif
-END_EVENT_TABLE()
-
 #endif
 
 // Slider
-wxSlider95::wxSlider95(void)
+wxSlider95::wxSlider95()
 {
   m_staticValue = 0;
   m_staticMin = 0;
@@ -257,6 +250,11 @@ void wxSlider95::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
         event.SetPosition(newPos);
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
+
+        wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+        cevent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( cevent );
+
       }
     }
 }
@@ -266,7 +264,7 @@ void wxSlider95::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
        MSWOnVScroll(wParam, pos, control);
 }
 
-wxSlider95::~wxSlider95(void)
+wxSlider95::~wxSlider95()
 {
     if (m_staticMin)
       DestroyWindow((HWND) m_staticMin);
@@ -276,7 +274,7 @@ wxSlider95::~wxSlider95(void)
       DestroyWindow((HWND) m_staticValue);
 }
 
-int wxSlider95::GetValue(void) const
+int wxSlider95::GetValue() const
 {
   return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
 }
@@ -345,7 +343,7 @@ void wxSlider95::GetPosition(int *x, int *y) const
   *y = point.y;
 }
 
-void wxSlider95::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;
   int y1 = y;
@@ -555,17 +553,17 @@ void wxSlider95::SetPageSize(int pageSize)
   m_pageSize = pageSize;
 }
 
-int wxSlider95::GetPageSize(void) const
+int wxSlider95::GetPageSize() const
 {
   return m_pageSize;
 }
 
-void wxSlider95::ClearSel(void)
+void wxSlider95::ClearSel()
 {
   ::SendMessage( (HWND) GetHWND(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );
 }
 
-void wxSlider95::ClearTicks(void)
+void wxSlider95::ClearTicks()
 {
   ::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
 }
@@ -576,17 +574,17 @@ void wxSlider95::SetLineSize(int lineSize)
   ::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
 }
 
-int wxSlider95::GetLineSize(void) const
+int wxSlider95::GetLineSize() const
 {
   return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );
 }
 
-int wxSlider95::GetSelEnd(void) const
+int wxSlider95::GetSelEnd() const
 {
   return (int) ::SendMessage( (HWND) GetHWND(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );
 }
 
-int wxSlider95::GetSelStart(void) const
+int wxSlider95::GetSelStart() const
 {
   return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
 }
@@ -601,7 +599,7 @@ void wxSlider95::SetThumbLength(int len)
   ::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
 }
 
-int wxSlider95::GetThumbLength(void) const
+int wxSlider95::GetThumbLength() const
 {
   return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
 }
@@ -616,21 +614,6 @@ bool wxSlider95::ContainsHWND(WXHWND hWnd) const
        return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
 }
 
-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSlider95::OnScroll(wxScrollEvent& event)
-{
-    wxEventType oldEvent = event.GetEventType();
-    event.SetEventType( wxEVT_COMMAND_SLIDER_UPDATED );
-    if ( !GetEventHandler()->ProcessEvent(event) )
-    {
-        event.SetEventType( oldEvent );
-        if (!GetParent()->GetEventHandler()->ProcessEvent(event))
-            event.Skip();
-    }
-}
-#endif
-
 void wxSlider95::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());