Use wxCLIP_CHILDREN in case we've disabled clipping globally

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index abfc87723d9bdab007ec75ae7c4aeb6c3393264b..d8ee50ab878930e8aee107faa02bb7832a05b94d 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -47,7 +47,7 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {

-    if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
+    if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))

         return false;
     
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
         return false;
     
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );


@@ -110,7 +110,7 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {

-    int style = 0;
+    int style = wxCLIP_CHILDREN;

 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
     style |= wxNB_BOTTOM|wxNB_FLAT;
 #else
 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
     style |= wxNB_BOTTOM|wxNB_FLAT;
 #else