/////////////////////////////////////////////////////////////////////////////
-// Name: propdlg.cpp
+// Name: src/generic/propdlg.cpp
// Purpose: wxPropertySheetDialog
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "propdlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#include "wx/defs.h"
+#if wxUSE_BOOKCTRL
#ifndef WX_PRECOMP
#include "wx/button.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)
-bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,
+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)
{
- 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 );
SetSizer(topSizer);
// This gives more space around the edges
m_innerSizer = new wxBoxSizer( wxVERTICAL );
- int extraSpace = 5;
-#ifdef __WXWINCE__
- extraSpace=0;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+ m_sheetOuterBorder = 0;
#endif
- topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
+ topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);
m_bookCtrl = CreateBookCtrl();
AddBookCtrl(m_innerSizer);
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()
+void wxPropertySheetDialog::LayoutDialog(int centreFlags)
{
-#ifndef __WXWINCE__
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
GetSizer()->Fit(this);
- Centre(wxBOTH);
+ 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)
{
-#if defined(__SMARTPHONE__)
- // TODO: if flags turns more buttons then make right menu from ID
- // to real menu with all the other IDs available. Perhaps that could be
- // embedded in CreateButtonSizer() directly.
- SetRightMenu(wxID_CANCEL);
- SetLeftMenu(wxID_OK);
-#elif !defined(__WXWINCE__)
- wxSizer* sizer = CreateButtonSizer(flags);
- m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+#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 & ButtonSizerFlags );
+ 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 = 0;
-#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
- style |= wxNB_BOTTOM|wxNB_FLAT;
-#else
- style |= wxBC_DEFAULT;
+ 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|wxBK_BUTTONBAR );
+ else
#endif
- return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+ 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.
#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
// The book control has to be sized larger than the dialog because of a border bug
// in WinCE
- sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
+ 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, 5 );
+ 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);
+ }
+ }
+}
+
+#endif // wxUSE_BOOKCTRL
projects / wxWidgets.git / blobdiff