reverted last commit, still broken for VC6

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index c340e946f438ae5634df5bfdec28a9638c82f682..d789c490a7687afdf01e85e9199c50bf2d96b3f3 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 
 #include "wx/scrolbar.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 )


@@ -41,7 +42,7 @@ wxBEGIN_FLAGS( wxScrollBarStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -71,10 +72,10 @@ wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
 
     wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , 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( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxScrollBar)
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxScrollBar)


@@ -93,7 +94,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     if (!parent)
            const wxString& name)
 {
     if (!parent)

-        return FALSE;
+        return false;

     parent->AddChild(this);
     SetName(name);
 #if wxUSE_VALIDATORS
     parent->AddChild(this);
     SetName(name);
 #if wxUSE_VALIDATORS


@@ -107,24 +108,24 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     SetForegroundColour(parent->GetForegroundColour()) ;
     m_windowStyle = style;
 
     SetForegroundColour(parent->GetForegroundColour()) ;
     m_windowStyle = style;
 

-  if ( id == -1 )
-      m_windowId = (int)NewControlId();
-  else
-    m_windowId = id;
+    if ( id == wxID_ANY )
+        m_windowId = (int)NewControlId();
+    else
+      m_windowId = id;

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-    if (width == -1)
+    if (width == wxDefaultCoord)

     {
       if (style & wxHORIZONTAL)
         width = 140;
       else
         width = 14;
     }
     {
       if (style & wxHORIZONTAL)
         width = 140;
       else
         width = 14;
     }

-    if (height == -1)
+    if (height == wxDefaultCoord)

     {
       if (style & wxVERTICAL)
         height = 140;
     {
       if (style & wxVERTICAL)
         height = 140;


@@ -151,8 +152,6 @@ bool wxScrollBar::Create(wxWindow *parent, 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());
-

     m_hWnd = (WXHWND)scroll_bar;
 
     // Subclass again for purposes of dialog editing mode
     m_hWnd = (WXHWND)scroll_bar;
 
     // Subclass again for purposes of dialog editing mode


@@ -160,7 +159,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     SetSize(x, y, width, height);
 
 
     SetSize(x, y, width, height);
 

-    return TRUE;
+    return true;

 }
 
 wxScrollBar::~wxScrollBar(void)
 }
 
 wxScrollBar::~wxScrollBar(void)


@@ -174,6 +173,8 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     int position,
         maxPos, trackPos = pos;
 
     int position,
         maxPos, trackPos = pos;
 

+    wxUnusedVar(trackPos);
+

     // when we're dragging the scrollbar we can't use pos parameter because it
     // is limited to 16 bits
     // JACS: now always using GetScrollInfo, since there's no reason
     // when we're dragging the scrollbar we can't use pos parameter because it
     // is limited to 16 bits
     // JACS: now always using GetScrollInfo, since there's no reason


@@ -285,7 +286,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     {
         // 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.

-        return FALSE;
+        return false;

     }
 
     wxScrollEvent event(scrollEvent, m_windowId);
     }
 
     wxScrollEvent event(scrollEvent, m_windowId);


@@ -375,4 +376,21 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

+wxSize wxScrollBar::DoGetBestSize() const
+{
+    int w = 100;
+    int h = 100;
+
+    if ( IsVertical() )
+    {
+        w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    }
+    else
+    {
+        h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+    }
+
+    return wxSize(w, h);
+}
+

 #endif // wxUSE_SCROLLBAR
 #endif // wxUSE_SCROLLBAR