adding #ifs for reflecting existing controls, fixing #ifdefs

[wxWidgets.git] / src / generic / propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d463f21ead355915583f3fba3bd680acedf5d25a..54a49b5dfad8ed6803ac5d47bd86df99cebcaacd 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -62,6 +62,8 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
+    parent = GetParentForModalDialog(parent);
+
     if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;
 
@@ -118,16 +120,12 @@ void wxPropertySheetDialog::CreateButtons(int flags)
     wxSystemOptions::SetOption(optionName,0);
 #endif
 
-    wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
+    wxSizer *buttonSizer = CreateButtonSizer(flags);
+    if( buttonSizer )
     {
         m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
         m_innerSizer->AddSpacer(2);
     }
-    else
-    {
-        delete buttonSizer;
-    }
 
 #ifdef __POCKETPC__
     // restore system option
@@ -153,7 +151,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #if wxUSE_TOOLBOOK
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
     if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
-        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxBK_BUTTONBAR );
+        bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR );
     else
 #endif
     if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))
@@ -227,4 +225,10 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
     }
 }
 
+// Override function in base
+wxWindow* wxPropertySheetDialog::GetContentWindow() const
+{
+    return GetBookCtrl();
+}
+
 #endif // wxUSE_BOOKCTRL