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

diff --git a/include/wx/msw/nonownedwnd.h b/include/wx/msw/nonownedwnd.h
index b9528dbc883d8f43b68adf5cb95f8dfc95cbd019..3eddd78ff9839f61e88c029d6bc0bf94635697db 100644 (file)
--- a/include/wx/msw/nonownedwnd.h
+++ b/include/wx/msw/nonownedwnd.h
@@ -18,9 +18,7 @@
 class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
 {
 public:
 class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
 {
 public:

-#ifndef __WXWINCE__

     virtual bool SetShape(const wxRegion& region);
     virtual bool SetShape(const wxRegion& region);

-#endif // !__WXWINCE__

 };
 
 #endif // _WX_MSW_NONOWNEDWND_H_
 };
 
 #endif // _WX_MSW_NONOWNEDWND_H_

diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h
index 6f32d2304e92ef77b8deab5d89c2cf3b8d97d72c..58f288065fac2e43fb7b5f463cdd4804b4f05052 100644 (file)
--- 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"
     #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
     #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 8cfe2e20645e091dbe7d7d08abb5371271d361bb..48dd03e24da574a43c0658953a4d9e5a5e1fef01 100644 (file)
--- a/src/msw/nonownedwnd.cpp
+++ b/src/msw/nonownedwnd.cpp
@@ -23,6 +23,9 @@
     #pragma hdrstop
 #endif
 
     #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"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"       // Only for wxFRAME_SHAPED.
     #include "wx/region.h"


@@ -35,8 +38,6 @@
 // wxNonOwnedWindow implementation
 // ============================================================================
 
 // wxNonOwnedWindow implementation
 // ============================================================================
 

-#ifndef __WXWINCE__
-

 bool wxNonOwnedWindow::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 bool wxNonOwnedWindow::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,