Fixed wxPropertySheetDialog for Smartphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/notebook.h"
|
#include "wx/bookctrl.h"
|
||||||
#include "wx/generic/propdlg.h"
|
#include "wx/generic/propdlg.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@@ -82,7 +82,10 @@ void wxPropertySheetDialog::LayoutDialog()
|
|||||||
// Creates the buttons, if any
|
// Creates the buttons, if any
|
||||||
void wxPropertySheetDialog::CreateButtons(int flags)
|
void wxPropertySheetDialog::CreateButtons(int flags)
|
||||||
{
|
{
|
||||||
#ifndef __WXWINCE__
|
#if defined(__WXWINCE__) && defined(__SMARTPHONE__)
|
||||||
|
SetLeftMenu(wxID_CANCEL);
|
||||||
|
SetLeftMenu(wxID_OK);
|
||||||
|
#elif !defined(__WXWINCE__)
|
||||||
wxSizer* sizer = CreateButtonSizer(flags);
|
wxSizer* sizer = CreateButtonSizer(flags);
|
||||||
m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
|
m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
|
||||||
#endif
|
#endif
|
||||||
@@ -92,16 +95,18 @@ void wxPropertySheetDialog::CreateButtons(int flags)
|
|||||||
wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
|
wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
|
||||||
{
|
{
|
||||||
int style = 0;
|
int style = 0;
|
||||||
#ifdef __WXWINCE__
|
#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
|
||||||
style |= wxNB_BOTTOM|wxNB_FLAT;
|
style |= wxNB_BOTTOM|wxNB_FLAT;
|
||||||
|
#else
|
||||||
|
style |= wxBC_DEFAULT;
|
||||||
#endif
|
#endif
|
||||||
return new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adds the book control to the inner sizer.
|
// Adds the book control to the inner sizer.
|
||||||
void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
|
void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
|
||||||
{
|
{
|
||||||
#ifdef __WXWINCE__
|
#if defined(__POCKETPC__) && wxUSE_NOTEBOOK
|
||||||
// The book control has to be sized larger than the dialog because of a border bug
|
// The book control has to be sized larger than the dialog because of a border bug
|
||||||
// in WinCE
|
// in WinCE
|
||||||
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
|
sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
|
||||||
|
Reference in New Issue
Block a user