Borland makefile fixes

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 452f520fa6f36caf5daeb99ab27e09bfd6c9fb75..26d7488832c21118c44ca019855fe11920eec1ea 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -31,17 +31,10 @@
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSliderMSW, wxControl)
-  EVT_SCROLL(wxSliderMSW::OnScroll)
-END_EVENT_TABLE()
-#endif
-
 #endif
 
 // Slider
-wxSliderMSW::wxSliderMSW(void)
+wxSliderMSW::wxSliderMSW()
 {
   m_staticValue = 0;
   m_staticMin = 0;
@@ -229,6 +222,10 @@ void wxSliderMSW::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 );
       }
     }
 }
@@ -238,7 +235,7 @@ void wxSliderMSW::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
        MSWOnVScroll(wParam, pos, control);
 }
 
-wxSliderMSW::~wxSliderMSW(void)
+wxSliderMSW::~wxSliderMSW()
 {
     if (m_staticMin)
       DestroyWindow((HWND) m_staticMin);
@@ -248,7 +245,7 @@ wxSliderMSW::~wxSliderMSW(void)
       DestroyWindow((HWND) m_staticValue);
 }
 
-int wxSliderMSW::GetValue(void) const
+int wxSliderMSW::GetValue() const
 {
   return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
 }
@@ -317,7 +314,7 @@ void wxSliderMSW::GetPosition(int *x, int *y) const
   *y = point.y;
 }
 
-void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;
   int y1 = y;
@@ -342,7 +339,7 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
-  wxGetCharSize(GetHWND(), &cx, &cy,& GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy,& this->GetFont());
 
   if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
   {
@@ -351,12 +348,12 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
     int min_len = 0;
 
     GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
 
     int max_len = 0;
 
     GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
     if (m_staticValue)
     {
       int new_width = (int)(wxMax(min_len, max_len));
@@ -402,11 +399,11 @@ void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
        {
     int min_len;
     GetWindowText((HWND) m_staticMin, buf, 300);
-    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,& GetFont());
+    GetTextExtent(buf, &min_len, &cyf,NULL,NULL,& this->GetFont());
 
     int max_len;
     GetWindowText((HWND) m_staticMax, buf, 300);
-    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & GetFont());
+    GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
 
     if (m_staticValue)
     {
@@ -504,16 +501,16 @@ void wxSliderMSW::SetPageSize(int pageSize)
   m_pageSize = pageSize;
 }
 
-int wxSliderMSW::GetPageSize(void) const
+int wxSliderMSW::GetPageSize() const
 {
   return m_pageSize;
 }
 
-void wxSliderMSW::ClearSel(void)
+void wxSliderMSW::ClearSel()
 {
 }
 
-void wxSliderMSW::ClearTicks(void)
+void wxSliderMSW::ClearTicks()
 {
 }
 
@@ -522,17 +519,17 @@ void wxSliderMSW::SetLineSize(int lineSize)
   m_lineSize = lineSize;
 }
 
-int wxSliderMSW::GetLineSize(void) const
+int wxSliderMSW::GetLineSize() const
 {
   return m_lineSize;
 }
 
-int wxSliderMSW::GetSelEnd(void) const
+int wxSliderMSW::GetSelEnd() const
 {
   return 0;
 }
 
-int wxSliderMSW::GetSelStart(void) const
+int wxSliderMSW::GetSelStart() const
 {
   return 0;
 }
@@ -545,7 +542,7 @@ void wxSliderMSW::SetThumbLength(int len)
 {
 }
 
-int wxSliderMSW::GetThumbLength(void) const
+int wxSliderMSW::GetThumbLength() const
 {
   return 0;
 }
@@ -559,21 +556,6 @@ bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
        return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
 }
 
-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSliderMSW::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 wxSliderMSW::Command (wxCommandEvent & event)
 {
   SetValue (event.GetInt());