added code to free memory allocated in wxSetEnv() when it uses putenv()

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 421e47578b048d800f88e57884110952e3f66a47..d892916568a3b49d231859ed6de19114d05e35b3 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/scrolbar.cpp
+// Name:        src/msw/scrolbar.cpp

 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "scrolbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,13 +18,14 @@
 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/scrolbar.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

-#include "wx/settings.h"

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )


@@ -69,7 +66,7 @@ wxEND_FLAGS( wxScrollBarStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxScrollBar)

-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )

 
     wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 
     wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))


@@ -150,25 +147,23 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     }
 #endif
 
     }
 #endif
 

-#if defined(__WIN95__)

     // A page size greater than one has the effect of reducing the effective
     // range, therefore the range has already been boosted artificially - so
     // reduce it again.
     if ( m_pageSize > 1 )
         maxPos -= (m_pageSize - 1);
     // A page size greater than one has the effect of reducing the effective
     // range, therefore the range has already been boosted artificially - so
     // reduce it again.
     if ( m_pageSize > 1 )
         maxPos -= (m_pageSize - 1);

-#endif // __WIN95__

 
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;
     switch ( wParam )
     {
 
     wxEventType scrollEvent = wxEVT_NULL;
 
     int nScrollInc;
     switch ( wParam )
     {

-        case SB_BOTTOM:
+        case SB_TOP:

             nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
             nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 

-        case SB_TOP:
+        case SB_BOTTOM:

             nScrollInc = -position;
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
             nScrollInc = -position;
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;


@@ -205,7 +200,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 
         case SB_ENDSCROLL:
             nScrollInc = 0;
 
         case SB_ENDSCROLL:
             nScrollInc = 0;

-            scrollEvent = wxEVT_SCROLL_ENDSCROLL;
+            scrollEvent = wxEVT_SCROLL_CHANGED;

             break;
 
         default:
             break;
 
         default:


@@ -224,7 +219,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
         SetThumbPosition(position);
     }
     else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&
         SetThumbPosition(position);
     }
     else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&

-                scrollEvent != wxEVT_SCROLL_ENDSCROLL )
+                scrollEvent != wxEVT_SCROLL_CHANGED )

     {
         // don't process the event if there is no displacement,
         // unless this is a thumb release or end scroll event.
     {
         // don't process the event if there is no displacement,
         // unless this is a thumb release or end scroll event.


@@ -241,7 +236,6 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-#if defined(__WIN95__)

     SCROLLINFO info;
     info.cbSize = sizeof(SCROLLINFO);
     info.nPage = 0;
     SCROLLINFO info;
     info.cbSize = sizeof(SCROLLINFO);
     info.nPage = 0;


@@ -250,9 +244,6 @@ void wxScrollBar::SetThumbPosition(int viewStart)
     info.fMask = SIF_POS ;
 
     ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);
     info.fMask = SIF_POS ;
 
     ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, TRUE);

-#else
-    ::SetScrollPos((HWND) GetHWND(), SB_CTL, viewStart, TRUE);
-#endif

 }
 
 int wxScrollBar::GetThumbPosition(void) const
 }
 
 int wxScrollBar::GetThumbPosition(void) const


@@ -273,36 +264,31 @@ int wxScrollBar::GetThumbPosition(void) const
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh)
 {
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh)
 {

-  m_viewSize = pageSize;
-  m_pageSize = thumbSize;
-  m_objectSize = range;
-
-  // The range (number of scroll steps) is the
-  // object length minus the page size.
-  int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
-
-#if defined(__WIN95__)
-  // Try to adjust the range to cope with page size > 1
-  // (see comment for SetPageLength)
-  if ( m_pageSize > 1 )
-  {
-    range1 += (m_pageSize - 1);
-  }
-
-  SCROLLINFO info;
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = m_pageSize;
-  info.nMin = 0;
-  info.nMax = range1;
-  info.nPos = position;
-
-  info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
-
-  ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh);
-#else
-  ::SetScrollPos((HWND)m_hWnd, SB_CTL, position, refresh);
-  ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range1, refresh);
-#endif
+    m_viewSize = pageSize;
+    m_pageSize = thumbSize;
+    m_objectSize = range;
+
+    // The range (number of scroll steps) is the
+    // object length minus the page size.
+    int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
+
+    // Try to adjust the range to cope with page size > 1
+    // (see comment for SetPageLength)
+    if ( m_pageSize > 1 )
+    {
+        range1 += (m_pageSize - 1);
+    }
+
+    SCROLLINFO info;
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = m_pageSize;
+    info.nMin = 0;
+    info.nMax = range1;
+    info.nPos = position;
+
+    info.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
+
+    ::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh);

 }
 
 void wxScrollBar::Command(wxCommandEvent& event)
 }
 
 void wxScrollBar::Command(wxCommandEvent& event)


@@ -344,4 +330,13 @@ WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
     return msStyle;
 }
 

+WXHBRUSH wxScrollBar::MSWControlColor(WXHDC pDC, WXHWND hWnd)
+{
+    // unless we have an explicitly set bg colour, use default (gradient under
+    // XP) brush instead of GetBackgroundColour() one as the base class would
+    //
+    // note that fg colour isn't used for a scrollbar
+    return UseBgCol() ? wxControl::MSWControlColor(pDC, hWnd) : NULL;
+}
+

 #endif // wxUSE_SCROLLBAR
 #endif // wxUSE_SCROLLBAR