Remove Windows CE support
Windows CE doesn't seem to be supported by Microsoft any longer. Last CE release was in early 2013 and the PocketPC and Smartphone targets supported by wxWidgets are long gone. The build files where already removed in an earlier cleanup this commit removes all files, every #ifdef and all documentation regarding the Windows CE support. Closes https://github.com/wxWidgets/wxWidgets/pull/81
This commit is contained in:
committed by
Vadim Zeitlin
parent
6fbc2bd0b7
commit
8282c1be0f
@@ -53,7 +53,6 @@
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog);
|
||||
|
||||
wxBEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
|
||||
EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
|
||||
EVT_IDLE(wxPropertySheetDialog::OnIdle)
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
@@ -72,9 +71,6 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
|
||||
// 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();
|
||||
@@ -95,41 +91,21 @@ void wxPropertySheetDialog::Init()
|
||||
// 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, wxSizerFlags().Expand().Border(wxALL, 2) );
|
||||
m_innerSizer->AddSpacer(2);
|
||||
}
|
||||
|
||||
#ifdef __POCKETPC__
|
||||
// restore system option
|
||||
wxSystemOptions::SetOption(optionName,status);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Creates the book control
|
||||
@@ -176,32 +152,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
|
||||
// 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, wxSizerFlags(1).Expand().Border(wxLEFT|wxTOP|wxRIGHT, borderSize) );
|
||||
#else
|
||||
sizer->Add( m_bookCtrl, wxSizerFlags(1).Expand().Border(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
|
||||
|
||||
Reference in New Issue
Block a user