Applied patch which allows you to detach a stream

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

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 992604a64f5b0fd0a7a1b218f10994f9cb34df12..b1dc497e115b584a08de8c7e6f1858144fced82d 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -17,7 +17,7 @@ class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {
 public:
     wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
 {
 public:
     wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }

-    ~wxScrollBar();
+    virtual ~wxScrollBar();

 
     wxScrollBar(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
 
     wxScrollBar(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,


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

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

 protected:
     virtual wxSize DoGetBestSize() const;
 protected:
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

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