Changed generic wxScrolledWindow -> wxGenericScrolledWindow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/scrolwin.h

@@ -26,17 +26,19 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
+#ifndef wxScrolledWindowStyle
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+#endif
 
 // ----------------------------------------------------------------------------
-// wxScrolledWindow
+// wxGenericScrolledWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxScrolledWindow : public wxPanel
+class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel
 {
 public:
-    wxScrolledWindow();
-    wxScrolledWindow(wxWindow *parent,
+    wxGenericScrolledWindow();
+    wxGenericScrolledWindow(wxWindow *parent,
                      wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
@@ -46,7 +48,7 @@ public:
         Create(parent, id, pos, size, style, name);
     }
 
-    ~wxScrolledWindow();
+    ~wxGenericScrolledWindow();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -55,7 +57,7 @@ public:
                 long style = wxScrolledWindowStyle,
                 const wxString& name = wxPanelNameStr);
 
-    // Normally the wxScrolledWindow will scroll itself, but in
+    // Normally the wxGenericScrolledWindow will scroll itself, but in
     // some rare occasions you might want it to scroll another
     // window (e.g. a child of it in order to scroll only a portion
     // the area between the scrollbars (spreadsheet: only cell area
@@ -115,7 +117,7 @@ public:
     // Override this function to draw the graphic (or just process EVT_PAINT)
     virtual void OnDraw(wxDC& WXUNUSED(dc)) {};
 
-    // Override this function if you don't want to have wxScrolledWindow
+    // Override this function if you don't want to have wxGenericScrolledWindow
     // automatically change the origin according to the scroll position.
     virtual void PrepareDC(wxDC& dc);
 
@@ -145,7 +147,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_ABSTRACT_CLASS(wxScrolledWindow)
+    DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
 };
 
 #endif

include/wx/gtk/scrolwin.h

@@ -26,7 +26,9 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
+#ifndef wxScrolledWindowStyle
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+#endif
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow

include/wx/gtk1/scrolwin.h

@@ -26,7 +26,9 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 // default scrolled window style
+#ifndef wxScrolledWindowStyle
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
+#endif
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow

include/wx/scrolwin.h

@@ -5,6 +5,22 @@
 #include "wx/gtk/scrolwin.h"
 #else
 #include "wx/generic/scrolwin.h"
+// For non-GTK+ platforms, always use wxGenericScrolledWindow
+class WXDLLEXPORT wxScrolledWindow: public wxGenericScrolledWindow
+{
+public:
+    DECLARE_CLASS(wxScrolledWindow)
+    wxScrolledWindow() {};
+    wxScrolledWindow(wxWindow *parent,
+                     wxWindowID id = -1,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxScrolledWindowStyle,
+                     const wxString& name = wxPanelNameStr)
+    {
+        wxGenericScrolledWindow::Create(parent, id, pos, size, style, name);
+    }
+};
 #endif
 
 #endif