Possible patch hand edited so might not apply right.
Tim S.
Index: src/sdk/scrollingdialog.cpp
===================================================================
--- src/sdk/scrollingdialog.cpp (revision 6119)
+++ src/sdk/scrollingdialog.cpp (working copy)
@@ -23,6 +23,7 @@
#define wxEXTRA_DIALOG_HEIGHT 0
#endif
+#if (!wxCHECK_VERSION(2, 9, 0))
IMPLEMENT_CLASS(wxDialogLayoutAdapter, wxObject)
/*!
@@ -402,6 +403,8 @@
IMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule)
+#endif
+
/*!
* wxScrollingDialog
*/
@@ -410,7 +413,9 @@
void wxScrollingDialog::Init()
{
+#if (!wxCHECK_VERSION(2, 9, 0))
wxDialogHelper::SetDialog(this);
+#endif
}
bool wxScrollingDialog::Create(wxWindow *parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
@@ -444,7 +449,9 @@
void wxScrollingPropertySheetDialog::Init()
{
+#if (!wxCHECK_VERSION(2, 9, 0))
wxDialogHelper::SetDialog(this);
+#endif
}
/// Returns the content window
Index: src/include/scrollingdialog.h
===================================================================
--- src/include/scrollingdialog.h (revision 6119)
+++ src/include/scrollingdialog.h (working copy)
@@ -23,12 +23,15 @@
*/
class wxScrollingDialog;
+#if (!wxCHECK_VERSION(2, 9, 0))
class wxDialogHelper;
+#endif
class wxBoxSizer;
class wxButton;
class wxScrolledWindow;
+#if (!wxCHECK_VERSION(2, 9, 0))
class wxDialogLayoutAdapter: public wxObject
{
DECLARE_CLASS(wxDialogLayoutAdapter)
@@ -153,11 +157,16 @@
static bool sm_layoutAdaptation;
};
+#endif
+
/*!
* A class that makes its content scroll if necessary
*/
-class wxScrollingDialog: public wxDialog, public wxDialogHelper
+class wxScrollingDialog: public wxDialog
+#if (!wxCHECK_VERSION(2, 9, 0))
+ , public wxDialogHelper
+#endif
{
DECLARE_CLASS(wxScrollingDialog)
public:
@@ -195,7 +204,10 @@
* A wxPropertySheetDialog class that makes its content scroll if necessary.
*/
-class wxScrollingPropertySheetDialog : public wxPropertySheetDialog, public wxDialogHelper
+class wxScrollingPropertySheetDialog : public wxPropertySheetDialog
+#if (!wxCHECK_VERSION(2, 9, 0))
+ , public wxDialogHelper
+#endif
{
public:
wxScrollingPropertySheetDialog() : wxPropertySheetDialog() { Init(); }