compilation fix

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index d934d96d8a5de59908776a4888438a2568f8831e..bac5e67a093db4de70e7ac16f46220ad28a5f91a 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -34,18 +34,18 @@ extern void wxFindMaxSize(HWND hwnd, RECT *rect);
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

-#if WXWIN_COMPATIBILITY

 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)

+#if WXWIN_COMPATIBILITY

   EVT_SCROLL(wxScrollBar::OnScroll)
   EVT_SCROLL(wxScrollBar::OnScroll)

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 #endif
 
 // Scrollbar
 
 #endif
 
 // Scrollbar

-bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos,
            const wxPoint& pos,

-           const wxSize& size, const long style,
+           const wxSize& size, long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -55,8 +55,8 @@ bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
     SetName(name);
        SetValidator(validator);
     
     SetName(name);
        SetValidator(validator);
     

-    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+    SetBackgroundColour(parent->GetBackgroundColour()) ;
+    SetForegroundColour(parent->GetForegroundColour()) ;

     m_windowStyle = style;
 
   if ( id == -1 )
     m_windowStyle = style;
 
   if ( id == -1 )


@@ -100,7 +100,7 @@ bool wxScrollBar::Create(wxWindow *parent, const wxWindowID id,
     ::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE);
     ShowWindow(scroll_bar, SW_SHOW);
 
     ::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE);
     ShowWindow(scroll_bar, SW_SHOW);
 

-    SetFont(* parent->GetFont());
+    SetFont(parent->GetFont());

 
     m_hWnd = (WXHWND)scroll_bar;
 
 
     m_hWnd = (WXHWND)scroll_bar;
 


@@ -116,7 +116,7 @@ wxScrollBar::~wxScrollBar(void)
 {
 }
 
 {
 }
 

-void wxScrollBar::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxScrollBar::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)

 {
     int position = ::GetScrollPos((HWND) control, SB_CTL);
     int minPos, maxPos;
 {
     int position = ::GetScrollPos((HWND) control, SB_CTL);
     int minPos, maxPos;


@@ -183,7 +183,7 @@ void wxScrollBar::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHW
         if (new_pos > maxPos)
             new_pos = maxPos;
 
         if (new_pos > maxPos)
             new_pos = maxPos;
 

-        SetValue(new_pos);
+        SetThumbPosition(new_pos);

         wxScrollEvent event(scrollEvent, m_windowId);
         event.SetPosition(new_pos);
         event.SetEventObject( this );
         wxScrollEvent event(scrollEvent, m_windowId);
         event.SetPosition(new_pos);
         event.SetEventObject( this );


@@ -191,12 +191,12 @@ void wxScrollBar::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHW
     }
 }
 
     }
 }
 

-void wxScrollBar::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxScrollBar::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)

 {
        MSWOnVScroll(wParam, pos, control);
 }
 
 {
        MSWOnVScroll(wParam, pos, control);
 }
 

-void wxScrollBar::SetPosition(const int viewStart)
+void wxScrollBar::SetThumbPosition(int viewStart)

 {
 #if defined(__WIN95__)
   SCROLLINFO info;
 {
 #if defined(__WIN95__)
   SCROLLINFO info;


@@ -212,13 +212,13 @@ void wxScrollBar::SetPosition(const int viewStart)
 #endif
 }
 
 #endif
 }
 

-int wxScrollBar::GetPosition(void) const
+int wxScrollBar::GetThumbPosition(void) const

 {
     return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
 }
 
 {
     return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
 }
 

-void wxScrollBar::SetScrollbar(const int position, const int thumbSize, const int range, const int pageSize,
-    const bool refresh)
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
+    bool refresh)

 {
   m_viewSize = pageSize;
   m_pageSize = thumbSize;
 {
   m_viewSize = pageSize;
   m_pageSize = thumbSize;


@@ -264,7 +264,7 @@ MaxScrollPos = MaxRangeValue - (PageSize - 1)
 */
 
 #if WXWIN_COMPATIBILITY
 */
 
 #if WXWIN_COMPATIBILITY

-void wxScrollBar::SetPageSize(const int pageLength)
+void wxScrollBar::SetPageSize(int pageLength)

 {
   m_pageSize = pageLength;
 
 {
   m_pageSize = pageLength;
 


@@ -278,7 +278,7 @@ void wxScrollBar::SetPageSize(const int pageLength)
 #endif
 }
 
 #endif
 }
 

-void wxScrollBar::SetObjectLength(const int objectLength)
+void wxScrollBar::SetObjectLength(int objectLength)

 {
   m_objectSize = objectLength;
 
 {
   m_objectSize = objectLength;
 


@@ -308,7 +308,7 @@ void wxScrollBar::SetObjectLength(const int objectLength)
 #endif
 }
 
 #endif
 }
 

-void wxScrollBar::SetViewLength(const int viewLength)
+void wxScrollBar::SetViewLength(int viewLength)

 {
     m_viewSize = viewLength;
 }
 {
     m_viewSize = viewLength;
 }


@@ -323,7 +323,7 @@ void wxScrollBar::GetValues(int *viewStart, int *viewLength, int *objectLength,
 }
 #endif
 
 }
 #endif
 

-WXHBRUSH wxScrollBar::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
   return 0;
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
   return 0;


@@ -331,7 +331,7 @@ WXHBRUSH wxScrollBar::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUIN
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetValue(event.m_commandInt);
+    SetThumbPosition(event.m_commandInt);

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }