diff --git a/include/wx/msw/nonownedwnd.h b/include/wx/msw/nonownedwnd.h index b9528dbc88..3eddd78ff9 100644 --- a/include/wx/msw/nonownedwnd.h +++ b/include/wx/msw/nonownedwnd.h @@ -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_ diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h index 6f32d2304e..58f288065f 100644 --- a/include/wx/nonownedwnd.h +++ b/include/wx/nonownedwnd.h @@ -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 diff --git a/src/msw/nonownedwnd.cpp b/src/msw/nonownedwnd.cpp index 8cfe2e2064..48dd03e24d 100644 --- a/src/msw/nonownedwnd.cpp +++ b/src/msw/nonownedwnd.cpp @@ -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,