Reverting previous commit

[wxWidgets.git] / include / wx / msw / scrolbar.h

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index b99cbf77e461438352a171039c3eeedb53e22c0a..719576135ab4b24281a813cf3224f29801756770 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "scrolbar.h"
 #endif
 
 #pragma interface "scrolbar.h"
 #endif
 


@@ -46,39 +46,26 @@ public:
 
     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
 
     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,

-            bool refresh = TRUE);
+            bool refresh = true);

 
 

-#if WXWIN_COMPATIBILITY
-    // Backward compatibility
-    int GetValue() const { return GetThumbPosition(); }
-    void SetValue(int viewStart) { SetThumbPosition(viewStart); }
-    void GetValues(int *viewStart, int *viewLength, int *objectLength,
-            int *pageLength) const ;
-    int GetViewLength() const { return m_viewSize; }
-    int GetObjectLength() const { return m_objectSize; }
-
-    void SetPageSize(int pageLength);
-    void SetObjectLength(int objectLength);
-    void SetViewLength(int viewLength);
-#endif
+    // needed for RTTI
+    void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
+    void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; }
+    void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }

 
     void Command(wxCommandEvent& event);
 
     void Command(wxCommandEvent& event);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 

-#if WXWIN_COMPATIBILITY
-    // Backward compatibility: generate an old-style scroll command
-    void OnScroll(wxScrollEvent& event);
-#endif // WXWIN_COMPATIBILITY
-

 protected:
 protected:

+
+    wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+

     int m_pageSize;
     int m_viewSize;
     int m_objectSize;
 
     int m_pageSize;
     int m_viewSize;
     int m_objectSize;
 

-    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar)
 };