Centering maximized wxTLWs on screen should do nothing.

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 2e5e93aa53eeb4b0bb0257f8fe98149afceba4d6..55bc4b3f2844aefeb27b2486427a7e45f1f0c9ec 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -383,9 +383,7 @@ bool MyApp::OnInit()
     myCanvas = new MyCanvas(frame);
     myCanvas->SetBackgroundColour(*wxWHITE);
 
     myCanvas = new MyCanvas(frame);
     myCanvas->SetBackgroundColour(*wxWHITE);
 

-#ifndef __WXWINCE__

     frame->Centre(wxBOTH);
     frame->Centre(wxBOTH);

-#endif

 
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 1645b2bf973448d6c95e455d10b26523a11ed83e..d99000e5e24428c455252cf89662b60bddfeca28 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/toplvcmn.cpp
+// Name:        src/common/toplvcmn.cpp

 // Purpose:     common (for all platforms) wxTopLevelWindow functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Purpose:     common (for all platforms) wxTopLevelWindow functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97


@@ -187,6 +187,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
         rectParent = rectDisplay;
     }
 
         rectParent = rectDisplay;
     }
 

+    // centering maximized window on screen is no-op
+    if((rectParent == rectDisplay) && IsMaximized())
+        return;
+

     // the new window rect candidate
     wxRect rect = GetRect().CentreIn(rectParent, dir);
 
     // the new window rect candidate
     wxRect rect = GetRect().CentreIn(rectParent, dir);
 


@@ -345,4 +349,3 @@ void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))
     // it's probably better than do nothing, isn't it?
     Raise();
 }
     // it's probably better than do nothing, isn't it?
     Raise();
 }

-

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index c1bba3066e78387ab65a49795219afb0a9fcfba0..82b65ed06be632bb9c528d7e27bbf1d92c90a85d 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -724,8 +724,8 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {

-#ifdef __WXWINCE__
-    return false;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    return true;

 #else
     return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0;
 #endif
 #else
     return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0;
 #endif