removed wxImage::operator wxBitmap()

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 2f98b0274b2e30aed906c7a176bbd2a16cb3c992..83a1d8e839cad188adeed9ad332aa408caa3eb7f 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -1,7 +1,28 @@
-#ifndef __SCROLWINH_BASE__
-#define __SCROLWINH_BASE__
+#ifndef _WX_SCROLWIN_H_BASE_
+#define _WX_SCROLWIN_H_BASE_
 
+#ifdef __WXGTK__
+#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);
+    }
+};
+#define wxSCROLLED_WINDOW_IS_GENERIC 1
+#endif
 
 #endif
-    // __SCROLWINH_BASE__
+    // _WX_SCROLWIN_H_BASE_