applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index ba961d4cc72a3ead8e223c3af767dc3bb48cbda5..cf9a27f234172d8d7f322c9dd9b8b907af343607 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -22,6 +22,7 @@ class WXDLLEXPORT wxTimer;
 // wxScrolledWindow and wxScrolledControl. It is a mix-in: just derive from it
 // to implement scrolling in your class.
 // ----------------------------------------------------------------------------
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
 
 class WXDLLEXPORT wxScrollHelper
 {
@@ -141,7 +142,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_2
     // Compatibility only, don't use
-    void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
+    wxDEPRECATED( void ViewStart(int *x, int *y) const );
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
@@ -205,6 +206,8 @@ protected:
     DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
+#endif
+
 // ----------------------------------------------------------------------------
 // wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------