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
@@ -23,7 +23,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
|
||||
#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
|
||||
|
||||
#include "wx/toolbar.h"
|
||||
|
||||
@@ -55,15 +55,6 @@
|
||||
#include "wx/msw/uxtheme.h"
|
||||
#endif
|
||||
|
||||
// this define controls whether the code for button colours remapping (only
|
||||
// useful for 16 or 256 colour images) is active at all, it's always turned off
|
||||
// for CE where it doesn't compile (and is probably not needed anyhow) and may
|
||||
// also be turned off for other systems if you always use 24bpp images and so
|
||||
// never need it
|
||||
#ifndef __WXWINCE__
|
||||
#define wxREMAP_BUTTON_COLOURS
|
||||
#endif // !__WXWINCE__
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -654,7 +645,6 @@ bool wxToolBar::Realize()
|
||||
|
||||
const size_t nTools = GetToolsCount();
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
// don't change the values of these constants, they can be set from the
|
||||
// user code via wxSystemOptions
|
||||
enum
|
||||
@@ -674,7 +664,6 @@ bool wxToolBar::Realize()
|
||||
: wxDisplayDepth() <= 8 ? Remap_Buttons
|
||||
: Remap_None;
|
||||
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
// delete all old buttons, if any
|
||||
for ( size_t pos = 0; pos < m_nButtons; pos++ )
|
||||
@@ -706,24 +695,14 @@ bool wxToolBar::Realize()
|
||||
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
|
||||
dcAllButtons.SelectObject(bitmap);
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
if ( remapValue != Remap_TransparentBg )
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
{
|
||||
// VZ: why do we hardcode grey colour for CE?
|
||||
dcAllButtons.SetBackground(wxBrush(
|
||||
#ifdef __WXWINCE__
|
||||
wxColour(0xc0, 0xc0, 0xc0)
|
||||
#else // !__WXWINCE__
|
||||
GetBackgroundColour()
|
||||
#endif // __WXWINCE__/!__WXWINCE__
|
||||
));
|
||||
dcAllButtons.SetBackground(GetBackgroundColour());
|
||||
dcAllButtons.Clear();
|
||||
}
|
||||
|
||||
HBITMAP hBitmap = GetHbitmapOf(bitmap);
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
if ( remapValue == Remap_Bg )
|
||||
{
|
||||
dcAllButtons.SelectObject(wxNullBitmap);
|
||||
@@ -735,7 +714,6 @@ bool wxToolBar::Realize()
|
||||
|
||||
dcAllButtons.SelectObject(bitmap);
|
||||
}
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
// the button position
|
||||
wxCoord x = 0;
|
||||
@@ -792,7 +770,6 @@ bool wxToolBar::Realize()
|
||||
wxImage
|
||||
imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
if ( remapValue == Remap_Buttons )
|
||||
{
|
||||
// we need to have light grey background colour for
|
||||
@@ -809,16 +786,13 @@ bool wxToolBar::Realize()
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
bmpDisabled = wxBitmap(imgGreyed);
|
||||
}
|
||||
#endif // wxUSE_IMAGE
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
if ( remapValue == Remap_Buttons )
|
||||
MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
m_disabledImgList->Add(bmpDisabled);
|
||||
}
|
||||
@@ -836,14 +810,12 @@ bool wxToolBar::Realize()
|
||||
// don't delete this HBITMAP!
|
||||
bitmap.SetHBITMAP(0);
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
if ( remapValue == Remap_Buttons )
|
||||
{
|
||||
// Map to system colours
|
||||
hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
|
||||
totalBitmapWidth, totalBitmapHeight);
|
||||
}
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
m_hBitmap = hBitmap;
|
||||
|
||||
@@ -2033,8 +2005,6 @@ WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
|
||||
// private functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef wxREMAP_BUTTON_COLOURS
|
||||
|
||||
WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
|
||||
{
|
||||
MemoryHDC hdcMem;
|
||||
@@ -2081,6 +2051,4 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
#endif // wxREMAP_BUTTON_COLOURS
|
||||
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
Reference in New Issue
Block a user