X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd9f3519cf4d3adec765a932a726e2f1d34e0df9..59859d3da18244fa31f82c30ded14f619c3c967f:/src/generic/propdlg.cpp diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp index 15cd495c34..20b01263c9 100644 --- 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, style); + if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name)) return false; @@ -118,7 +120,7 @@ void wxPropertySheetDialog::CreateButtons(int flags) wxSystemOptions::SetOption(optionName,0); #endif - wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags ); + wxSizer *buttonSizer = CreateButtonSizer(flags); if( buttonSizer ) { m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2); @@ -149,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)) @@ -223,4 +225,10 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event) } } +// Override function in base +wxWindow* wxPropertySheetDialog::GetContentWindow() const +{ + return GetBookCtrl(); +} + #endif // wxUSE_BOOKCTRL