GetParentForModalDialog() was called from the ctor initialized list before m_windowStyle could be initialized by the base class ctor in several different places, meaning that the check for wxDIALOG_NO_PARENT in this function was using uninitialized variable. Fix this by passing the style parameter explicitly to this function to allow using it from derived class ctors. Still keep an overload which uses the actual window parent and flags which is simpler to use for later calls to this function. Thanks valgrind for finding this one. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
235 lines
6.6 KiB
C++
235 lines
6.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/generic/propdlg.cpp
|
|
// Purpose: wxPropertySheetDialog
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 2005-03-12
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_BOOKCTRL
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/button.h"
|
|
#include "wx/sizer.h"
|
|
#include "wx/intl.h"
|
|
#include "wx/log.h"
|
|
#include "wx/msgdlg.h"
|
|
#endif
|
|
|
|
#include "wx/bookctrl.h"
|
|
|
|
#if wxUSE_NOTEBOOK
|
|
#include "wx/notebook.h"
|
|
#endif
|
|
#if wxUSE_CHOICEBOOK
|
|
#include "wx/choicebk.h"
|
|
#endif
|
|
#if wxUSE_TOOLBOOK
|
|
#include "wx/toolbook.h"
|
|
#endif
|
|
#if wxUSE_LISTBOOK
|
|
#include "wx/listbook.h"
|
|
#endif
|
|
#if wxUSE_TREEBOOK
|
|
#include "wx/treebook.h"
|
|
#endif
|
|
|
|
#include "wx/generic/propdlg.h"
|
|
#include "wx/sysopt.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxPropertySheetDialog
|
|
//-----------------------------------------------------------------------------
|
|
|
|
IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
|
|
|
|
BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
|
|
EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
|
|
EVT_IDLE(wxPropertySheetDialog::OnIdle)
|
|
END_EVENT_TABLE()
|
|
|
|
bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,
|
|
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;
|
|
|
|
wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
|
|
SetSizer(topSizer);
|
|
|
|
// This gives more space around the edges
|
|
m_innerSizer = new wxBoxSizer( wxVERTICAL );
|
|
|
|
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
|
|
m_sheetOuterBorder = 0;
|
|
#endif
|
|
topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);
|
|
|
|
m_bookCtrl = CreateBookCtrl();
|
|
AddBookCtrl(m_innerSizer);
|
|
|
|
return true;
|
|
}
|
|
|
|
void wxPropertySheetDialog::Init()
|
|
{
|
|
m_sheetStyle = wxPROPSHEET_DEFAULT;
|
|
m_innerSizer = NULL;
|
|
m_bookCtrl = NULL;
|
|
m_sheetOuterBorder = 2;
|
|
m_sheetInnerBorder = 5;
|
|
}
|
|
|
|
// Layout the dialog, to be called after pages have been created
|
|
void wxPropertySheetDialog::LayoutDialog(int centreFlags)
|
|
{
|
|
#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
|
|
GetSizer()->Fit(this);
|
|
GetSizer()->SetSizeHints(this);
|
|
if (centreFlags)
|
|
Centre(centreFlags);
|
|
#else
|
|
wxUnusedVar(centreFlags);
|
|
#endif
|
|
#if defined(__SMARTPHONE__)
|
|
if (m_bookCtrl)
|
|
m_bookCtrl->SetFocus();
|
|
#endif
|
|
}
|
|
|
|
// Creates the buttons, if any
|
|
void wxPropertySheetDialog::CreateButtons(int flags)
|
|
{
|
|
#ifdef __POCKETPC__
|
|
// keep system option status
|
|
const wxChar *optionName = wxT("wince.dialog.real-ok-cancel");
|
|
const int status = wxSystemOptions::GetOptionInt(optionName);
|
|
wxSystemOptions::SetOption(optionName,0);
|
|
#endif
|
|
|
|
wxSizer *buttonSizer = CreateButtonSizer(flags);
|
|
if( buttonSizer )
|
|
{
|
|
m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
|
|
m_innerSizer->AddSpacer(2);
|
|
}
|
|
|
|
#ifdef __POCKETPC__
|
|
// restore system option
|
|
wxSystemOptions::SetOption(optionName,status);
|
|
#endif
|
|
}
|
|
|
|
// Creates the book control
|
|
wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
|
|
{
|
|
int style = wxCLIP_CHILDREN | wxBK_DEFAULT;
|
|
|
|
wxBookCtrlBase* bookCtrl = NULL;
|
|
|
|
#if wxUSE_NOTEBOOK
|
|
if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
|
|
bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
#endif
|
|
#if wxUSE_CHOICEBOOK
|
|
if (GetSheetStyle() & wxPROPSHEET_CHOICEBOOK)
|
|
bookCtrl = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
#endif
|
|
#if wxUSE_TOOLBOOK
|
|
#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
|
|
if (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK)
|
|
bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style|wxTBK_BUTTONBAR );
|
|
else
|
|
#endif
|
|
if ((GetSheetStyle() & wxPROPSHEET_TOOLBOOK) || (GetSheetStyle() & wxPROPSHEET_BUTTONTOOLBOOK))
|
|
bookCtrl = new wxToolbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
#endif
|
|
#if wxUSE_LISTBOOK
|
|
if (GetSheetStyle() & wxPROPSHEET_LISTBOOK)
|
|
bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
#endif
|
|
#if wxUSE_TREEBOOK
|
|
if (GetSheetStyle() & wxPROPSHEET_TREEBOOK)
|
|
bookCtrl = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
#endif
|
|
if (!bookCtrl)
|
|
bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
|
|
|
if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
|
|
bookCtrl->SetFitToCurrentPage(true);
|
|
|
|
return bookCtrl;
|
|
}
|
|
|
|
// Adds the book control to the inner sizer.
|
|
void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
|
|
{
|
|
#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
|
|
// The book control has to be sized larger than the dialog because of a border bug
|
|
// in WinCE
|
|
int borderSize = -2;
|
|
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
|
|
#else
|
|
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder );
|
|
#endif
|
|
}
|
|
|
|
void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
|
|
{
|
|
#if defined(__SMARTPHONE__)
|
|
// Attempt to focus the choice control: not yet working, but might
|
|
// be a step in the right direction. OnActivate overrides the default
|
|
// handler in toplevel.cpp that sets the focus for the first child of
|
|
// of the dialog (the choicebook).
|
|
if (event.GetActive())
|
|
{
|
|
wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);
|
|
if (choiceBook)
|
|
choiceBook->SetFocus();
|
|
}
|
|
else
|
|
#endif
|
|
event.Skip();
|
|
}
|
|
|
|
// Resize dialog if necessary
|
|
void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
|
|
{
|
|
event.Skip();
|
|
|
|
if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
|
|
{
|
|
int sel = GetBookCtrl()->GetSelection();
|
|
if (sel != -1 && sel != m_selectedPage)
|
|
{
|
|
GetBookCtrl()->InvalidateBestSize();
|
|
InvalidateBestSize();
|
|
SetSizeHints(-1, -1, -1, -1);
|
|
|
|
m_selectedPage = sel;
|
|
LayoutDialog(0);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Override function in base
|
|
wxWindow* wxPropertySheetDialog::GetContentWindow() const
|
|
{
|
|
return GetBookCtrl();
|
|
}
|
|
|
|
#endif // wxUSE_BOOKCTRL
|