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 ff20508a5a8bfaa6945ae0c7611631d4afae1938..fdca302814771ed213059b165c923b2394a2cbe0 100644 (file)
--- 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
 
     // 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;
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoGetSize(int *width, int *height) const;

+#endif // __WXWINCE__

 
 
     // is the window currently iconized?
 
 
     // is the window currently iconized?

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index a3b75ce292175cce5a25bc39373e7a4e91b1f49e..4da7baf52816be25353c11a51a1ace4df437e400 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -784,11 +784,10 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
 // wxTopLevelWindowMSW geometry
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowMSW geometry
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
-{
-

 #ifndef __WXWINCE__
 
 #ifndef __WXWINCE__
 

+void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
+{

     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;


@@ -824,15 +823,11 @@ void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
     }
     //else: normal case
 
     }
     //else: normal case
 

-#endif // __WXWINCE__
-

     wxTopLevelWindowBase::DoGetPosition(x, y);
 }
 
 void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
 {
     wxTopLevelWindowBase::DoGetPosition(x, y);
 }
 
 void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
 {

-#ifndef __WXWINCE__
-

     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;
     if ( IsIconized() )
     {
         WINDOWPLACEMENT wp;


@@ -853,11 +848,11 @@ void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
     }
     //else: normal case
 
     }
     //else: normal case
 

-#endif
-

     wxTopLevelWindowBase::DoGetSize(width, height);
 }
 
     wxTopLevelWindowBase::DoGetSize(width, height);
 }
 

+#endif // __WXWINCE__
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW fullscreen
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW fullscreen
 // ----------------------------------------------------------------------------