Don't use wxMSW version of wxNonOwnedWindow at all under WinCE.

This class becomes completely trivial under WinCE as its functionality
(setting the window shape) can't be implemented under this platform, so just
don't compile it at all there.

This both (slightly) reduces the amount of #if checks and should make the code
(slightly) smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-10-15 00:20:56 +00:00
parent 322853b3d6
commit 164db177a2
3 changed files with 4 additions and 5 deletions

View File

@ -18,9 +18,7 @@
class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
{
public:
#ifndef __WXWINCE__
virtual bool SetShape(const wxRegion& region);
#endif // !__WXWINCE__
};
#endif // _WX_MSW_NONOWNEDWND_H_

View File

@ -34,7 +34,7 @@ public:
#include "wx/gtk/nonownedwnd.h"
#elif defined(__WXMAC__)
#include "wx/osx/nonownedwnd.h"
#elif defined(__WXMSW__)
#elif defined(__WXMSW__) && !defined(__WXWINCE__)
#include "wx/msw/nonownedwnd.h"
#else
// No special class needed in other ports, they can derive both wxTLW and

View File

@ -23,6 +23,9 @@
#pragma hdrstop
#endif
// This class can't be implemented and hence is not used under Win CE.
#ifndef __WXWINCE__
#ifndef WX_PRECOMP
#include "wx/frame.h" // Only for wxFRAME_SHAPED.
#include "wx/region.h"
@ -35,8 +38,6 @@
// wxNonOwnedWindow implementation
// ============================================================================
#ifndef __WXWINCE__
bool wxNonOwnedWindow::SetShape(const wxRegion& region)
{
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,