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
@@ -121,12 +121,7 @@ protected:
|
||||
wxCheckBox *m_chkSort;
|
||||
|
||||
// the choice itself and the sizer it is in
|
||||
#ifdef __WXWINCE__
|
||||
wxChoiceBase
|
||||
#else
|
||||
wxChoice
|
||||
#endif
|
||||
*m_choice;
|
||||
wxChoice *m_choice;
|
||||
|
||||
wxSizer *m_sizerChoice;
|
||||
|
||||
|
@@ -156,12 +156,7 @@ protected:
|
||||
*m_chkOwnerDraw;
|
||||
|
||||
// the listbox itself and the sizer it is in
|
||||
#ifdef __WXWINCE__
|
||||
wxListBoxBase
|
||||
#else
|
||||
wxListBox
|
||||
#endif
|
||||
*m_lbox;
|
||||
wxListBox *m_lbox;
|
||||
|
||||
wxSizer *m_sizerLbox;
|
||||
|
||||
|
@@ -121,10 +121,8 @@ protected:
|
||||
void RecreateBook();
|
||||
virtual wxBookCtrlBase *CreateBook(long flags) = 0;
|
||||
|
||||
#if USE_ICONS_IN_BOOK
|
||||
// create or destroy the image list
|
||||
void CreateImageList();
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
// create a new page
|
||||
wxWindow *CreateNewPage();
|
||||
@@ -155,10 +153,8 @@ protected:
|
||||
wxBookCtrlBase *m_book;
|
||||
wxSizer *m_sizerBook;
|
||||
|
||||
#if USE_ICONS_IN_BOOK
|
||||
// the image list for our book
|
||||
wxImageList *m_imageList;
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
private:
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
@@ -196,9 +192,7 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, c
|
||||
{
|
||||
// init everything
|
||||
m_chkImages = NULL;
|
||||
#if USE_ICONS_IN_BOOK
|
||||
m_imageList = NULL;
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
m_book = NULL;
|
||||
m_radioOrient = NULL;
|
||||
@@ -289,18 +283,14 @@ void BookWidgetsPage::CreateContent()
|
||||
|
||||
// final initializations
|
||||
Reset();
|
||||
#if USE_ICONS_IN_BOOK
|
||||
CreateImageList();
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
SetSizer(sizerTop);
|
||||
}
|
||||
|
||||
BookWidgetsPage::~BookWidgetsPage()
|
||||
{
|
||||
#if USE_ICONS_IN_BOOK
|
||||
delete m_imageList;
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -313,7 +303,6 @@ void BookWidgetsPage::Reset()
|
||||
m_radioOrient->SetSelection(Orient_Top);
|
||||
}
|
||||
|
||||
#if USE_ICONS_IN_BOOK
|
||||
void BookWidgetsPage::CreateImageList()
|
||||
{
|
||||
if ( m_chkImages->GetValue() )
|
||||
@@ -341,7 +330,6 @@ void BookWidgetsPage::CreateImageList()
|
||||
// it would be logical if this removed the image list from book, under
|
||||
// MSW it crashes instead - FIXME
|
||||
}
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
void BookWidgetsPage::RecreateBook()
|
||||
{
|
||||
@@ -378,9 +366,7 @@ void BookWidgetsPage::RecreateBook()
|
||||
|
||||
m_book = CreateBook(flags);
|
||||
|
||||
#if USE_ICONS_IN_BOOK
|
||||
CreateImageList();
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
if ( oldBook )
|
||||
{
|
||||
@@ -429,7 +415,6 @@ int BookWidgetsPage::GetTextValue(wxTextCtrl *text) const
|
||||
|
||||
int BookWidgetsPage::GetIconIndex() const
|
||||
{
|
||||
#if USE_ICONS_IN_BOOK
|
||||
if ( m_imageList )
|
||||
{
|
||||
int nImages = m_imageList->GetImageCount();
|
||||
@@ -438,7 +423,6 @@ int BookWidgetsPage::GetIconIndex() const
|
||||
return m_book->GetPageCount() % nImages;
|
||||
}
|
||||
}
|
||||
#endif // USE_ICONS_IN_BOOK
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
@@ -474,7 +474,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
|
||||
|
||||
InitBook();
|
||||
|
||||
#ifndef __WXHANDHELD__
|
||||
// the lower one only has the log listbox and a button to clear it
|
||||
#if USE_LOG
|
||||
wxSizer *sizerDown = new wxStaticBoxSizer(
|
||||
@@ -504,12 +503,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
|
||||
sizerTop->Add(0, 5, 0, wxGROW); // spacer in between
|
||||
sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10);
|
||||
|
||||
#else // !__WXHANDHELD__/__WXHANDHELD__
|
||||
|
||||
sizerTop->Add(m_book, 1, wxGROW | wxALL );
|
||||
|
||||
#endif // __WXHANDHELD__
|
||||
|
||||
m_panel->SetSizer(sizerTop);
|
||||
|
||||
const wxSize sizeMin = m_panel->GetBestSize();
|
||||
@@ -527,14 +520,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
|
||||
|
||||
void WidgetsFrame::InitBook()
|
||||
{
|
||||
#if USE_ICONS_IN_BOOK
|
||||
wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
|
||||
|
||||
wxImage img(sample_xpm);
|
||||
imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE)));
|
||||
#else
|
||||
wxImageList *imageList = NULL;
|
||||
#endif
|
||||
|
||||
#if !USE_TREEBOOK
|
||||
WidgetsBookCtrl *books[MAX_PAGES];
|
||||
@@ -608,9 +597,7 @@ void WidgetsFrame::InitBook()
|
||||
|
||||
GetMenuBar()->Append(menuPages, wxT("&Page"));
|
||||
|
||||
#if USE_ICONS_IN_BOOK
|
||||
m_book->AssignImageList(imageList);
|
||||
#endif
|
||||
|
||||
for ( cat = 0; cat < MAX_PAGES; cat++ )
|
||||
{
|
||||
@@ -618,9 +605,7 @@ void WidgetsFrame::InitBook()
|
||||
m_book->AddPage(NULL,WidgetsCategories[cat],false,0);
|
||||
#else
|
||||
m_book->AddPage(books[cat],WidgetsCategories[cat],false,0);
|
||||
#if USE_ICONS_IN_BOOK
|
||||
books[cat]->SetImageList(imageList);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// now do add them
|
||||
@@ -1242,12 +1227,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
|
||||
wxCLIP_CHILDREN |
|
||||
wxTAB_TRAVERSAL)
|
||||
{
|
||||
#if USE_ICONS_IN_BOOK
|
||||
imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE)));
|
||||
#else
|
||||
wxUnusedVar(imaglist);
|
||||
wxUnusedVar(icon);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* static */
|
||||
|
@@ -11,7 +11,7 @@
|
||||
#ifndef _WX_SAMPLE_WIDGETS_H_
|
||||
#define _WX_SAMPLE_WIDGETS_H_
|
||||
|
||||
#if wxUSE_TREEBOOK && !defined(__WXHANDHELD__)
|
||||
#if wxUSE_TREEBOOK
|
||||
#include "wx/treebook.h"
|
||||
#define USE_TREEBOOK 1
|
||||
#define WidgetsBookCtrl wxTreebook
|
||||
@@ -29,18 +29,13 @@
|
||||
#define wxWidgetsbookEventHandler(func) wxBookCtrlEventHandler(func)
|
||||
#endif
|
||||
|
||||
#if wxUSE_LOG && !defined(__WXHANDHELD__)
|
||||
#if wxUSE_LOG
|
||||
#define USE_LOG 1
|
||||
#else
|
||||
#define USE_LOG 0
|
||||
#endif
|
||||
|
||||
#if defined(__WXHANDHELD__)
|
||||
#define USE_ICONS_IN_BOOK 0
|
||||
#else
|
||||
#define USE_ICONS_IN_BOOK 1
|
||||
#define ICON_SIZE 16
|
||||
#endif
|
||||
#define ICON_SIZE 16
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSizer;
|
||||
|
Reference in New Issue
Block a user