Applied SetForegorund colour patch for GTK2.

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index e4c0a96763b14745f04f0e37298ed0e09846e82c..9ebdc14f1bb658b991cf9c91e9909a8b7adc349a 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -146,7 +146,7 @@ public:
 
 protected:
     // get pointer to our scroll rect if we use it or NULL
 
 protected:
     // get pointer to our scroll rect if we use it or NULL

-    const wxRect *GetRect() const
+    const wxRect *GetScrollRect() const

     {
         return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
     }
     {
         return m_rectToScroll.width != 0 ? &m_rectToScroll : NULL;
     }


@@ -219,17 +219,17 @@ protected:
     public:
         wxScrolledWindow() { }
         wxScrolledWindow(wxWindow *parent,
     public:
         wxScrolledWindow() { }
         wxScrolledWindow(wxWindow *parent,

-                         wxWindowID id = -1,
+                         wxWindowID winid = -1,

                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxScrolledWindowStyle,
                          const wxString& name = wxPanelNameStr)
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxScrolledWindowStyle,
                          const wxString& name = wxPanelNameStr)

-            : wxGenericScrolledWindow(parent, id, pos, size, style, name)
+            : wxGenericScrolledWindow(parent, winid, pos, size, style, name)

         {
         }
 
     private:
         {
         }
 
     private:

-        DECLARE_CLASS(wxScrolledWindow)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)

     };
 
     #define wxSCROLLED_WINDOW_IS_GENERIC 1
     };
 
     #define wxSCROLLED_WINDOW_IS_GENERIC 1


@@ -238,4 +238,3 @@ protected:
 #endif
     // _WX_SCROLWIN_H_BASE_
 
 #endif
     // _WX_SCROLWIN_H_BASE_
 

-// vi:sts=4:sw=4:et