Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid do-nothing virtuals in WinCE.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2007-02-13 17:08:36 +00:00
parent 261fb04124
commit c5dc89a1b1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/toplevel.h
View File

@@ -129,8 +129,10 @@ protected:
// override those to return the normal window coordinates even when the // override those to return the normal window coordinates even when the
// window is minimized // window is minimized
#ifndef __WXWINCE__
virtual void DoGetPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) const;
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const;
#endif // __WXWINCE__
// is the window currently iconized? // is the window currently iconized?

13
src/msw/toplevel.cpp
View File

@@ -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() ) if ( IsIconized() )
{ {
WINDOWPLACEMENT wp; 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); wxTopLevelWindowBase::DoGetPosition(x, y);
} }
void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
{ {
#ifndef __WXWINCE__
if ( IsIconized() ) if ( IsIconized() )
{ {
WINDOWPLACEMENT wp; 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
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------