xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 7eaa272adb94f424101c6cb067502f01ff156c16..0e1ed500c9167a13150df61e44c227b8e8969d6e 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -29,16 +29,23 @@
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxScrollBar)
+       WX_PROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 )
+       WX_PROPERTY( Range , int , SetRange, GetRange, 0 )
+       WX_PROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 )
+       WX_PROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 )
+WX_END_PROPERTIES_TABLE()

 
 

-/*
-       TODO PROPERTIES
-               value (long,0)
-               thumbsize(long,1)
-               range( long , 10 )
-               pagesize( long , 1)
-*/
+WX_BEGIN_HANDLERS_TABLE(wxScrollBar)
+WX_END_HANDLERS_TABLE()

 
 

+WX_CONSTRUCTOR_5( wxScrollBar , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
+#endif

 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,


@@ -273,7 +280,7 @@ int wxScrollBar::GetThumbPosition(void) const
     wxZeroMemory(scrollInfo);
     scrollInfo.cbSize = sizeof(SCROLLINFO);
     scrollInfo.fMask = SIF_POS;
     wxZeroMemory(scrollInfo);
     scrollInfo.cbSize = sizeof(SCROLLINFO);
     scrollInfo.fMask = SIF_POS;

-    
+

     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {
         wxLogLastError(_T("GetScrollInfo"));
     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {
         wxLogLastError(_T("GetScrollInfo"));