From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Tue, 13 Feb 2007 17:08:36 +0000 (+0000)
Subject: Avoid do-nothing virtuals in WinCE.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c5dc89a1b196864c87b26e96f2cc68e784b77d8e?hp=261fb041249ca504a5cdf3d38f67de9367d5bd7b

Avoid do-nothing virtuals in WinCE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index ff20508a5a..fdca302814 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -129,8 +129,10 @@ protected:
 
     // override those to return the normal window coordinates even when the
     // window is minimized
+#ifndef __WXWINCE__
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoGetSize(int *width, int *height) const;
+#endif // __WXWINCE__
 
 
     // is the window currently iconized?
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index a3b75ce292..4da7baf528 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -784,11 +784,10 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
 // wxTopLevelWindowMSW geometry
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
-{
-
 #ifndef __WXWINCE__
 
+void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
+{
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
@@ -824,15 +823,11 @@ void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
     }
     //else: normal case
 
-#endif // __WXWINCE__
-
     wxTopLevelWindowBase::DoGetPosition(x, y);
 }
 
 void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
 {
-#ifndef __WXWINCE__
-
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
@@ -853,11 +848,11 @@ void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
     }
     //else: normal case
 
-#endif
-
     wxTopLevelWindowBase::DoGetSize(width, height);
 }
 
+#endif // __WXWINCE__
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW fullscreen
 // ----------------------------------------------------------------------------