Further wxAUI commits

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

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 04e231de77f8419619b2fe51036e8969284efb4f..45e6dec23b6354c1a9d8a71373bec823b6d8e7d3 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -12,10 +12,6 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

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

 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {


@@ -46,7 +42,7 @@ 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);

 
     // needed for RTTI
     void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
 
     // needed for RTTI
     void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }


@@ -54,14 +50,16 @@ public:
     void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
 
     void Command(wxCommandEvent& event);
     void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
 
     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);
 

-protected:
+    // override wxControl version to not use solid background here
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);

 
 

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

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