Ensure that strings returned by wxMBConv_cf are in NFC form.

[wxWidgets.git] / src / common / toplvcmn.cpp

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 0bd8d637cbfd693e162fd9a19a282b869a9c9d7a..ceee633abfb8dc1478b376dd086031fb86c504ec 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -123,7 +123,7 @@ bool wxTopLevelWindowBase::Destroy()
           i != end;
           ++i )
     {
           i != end;
           ++i )
     {

-        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);

         if ( win != this && win->IsShown() )
         {
             // there remains at least one other visible TLW, we can hide this
         if ( win != this && win->IsShown() )
         {
             // there remains at least one other visible TLW, we can hide this


@@ -150,7 +150,7 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
     // then decide whether we should exit at all
     for ( i = wxTopLevelWindows.begin(); i != end; ++i )
     {
     // then decide whether we should exit at all
     for ( i = wxTopLevelWindows.begin(); i != end; ++i )
     {

-        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);

         if ( win->ShouldPreventAppExit() )
         {
             // there remains at least one important TLW, don't exit
         if ( win->ShouldPreventAppExit() )
         {
             // there remains at least one important TLW, don't exit


@@ -162,7 +162,7 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
     for ( i = wxTopLevelWindows.begin(); i != end; ++i )
     {
         // don't close twice the windows which are already marked for deletion
     for ( i = wxTopLevelWindows.begin(); i != end; ++i )
     {
         // don't close twice the windows which are already marked for deletion

-        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);

         if ( !wxPendingDelete.Member(win) && !win->Close() )
         {
             // one of the windows refused to close, don't exit
         if ( !wxPendingDelete.Member(win) && !win->Close() )
         {
             // one of the windows refused to close, don't exit


@@ -202,7 +202,7 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
     wxSize size = wxGetClientDisplayRect().GetSize();
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
     wxSize size = wxGetClientDisplayRect().GetSize();

-
+#ifndef __WXOSX_IPHONE__

     // create proportionally bigger windows on small screens
     if ( size.x >= 1024 )
         size.x = 400;
     // create proportionally bigger windows on small screens
     if ( size.x >= 1024 )
         size.x = 400;


@@ -218,7 +218,7 @@ wxSize wxTopLevelWindowBase::GetDefaultSize()
         size.y *= 2;
         size.y /= 3;
     }
         size.y *= 2;
         size.y /= 3;
     }

-
+#endif

     return size;
 }
 
     return size;
 }
 


@@ -226,7 +226,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
 {
     // on some platforms centering top level windows is impossible
     // because they are always maximized by guidelines or limitations
 {
     // on some platforms centering top level windows is impossible
     // because they are always maximized by guidelines or limitations

-    if(IsAlwaysMaximized())
+    //
+    // and centering a maximized window doesn't make sense as its position
+    // can't change
+    if ( IsAlwaysMaximized() || IsMaximized() )

         return;
 
     // we need the display rect anyhow so store it first: notice that we should
         return;
 
     // we need the display rect anyhow so store it first: notice that we should


@@ -248,25 +251,19 @@ void wxTopLevelWindowBase::DoCentre(int dir)
         // parent frame under Mac but could happen elsewhere too if the frame
         // was hidden/moved away for some reason), don't use it as otherwise
         // this window wouldn't be visible at all
         // parent frame under Mac but could happen elsewhere too if the frame
         // was hidden/moved away for some reason), don't use it as otherwise
         // this window wouldn't be visible at all

-        if ( !rectDisplay.Contains(rectParent.GetTopLeft()) &&
-                !rectParent.Contains(rectParent.GetBottomRight()) )
+        if ( !rectParent.Intersects(rectDisplay) )

         {
         {

-            // this is enough to make IsEmpty() test below pass
-            rectParent.width = 0;
+            // just centre on screen then
+            rectParent = rectDisplay;

         }
     }
         }
     }

-
-    if ( rectParent.IsEmpty() )
+    else

     {
         // we were explicitly asked to centre this window on the entire screen
         // or if we have no parent anyhow and so can't centre on it
         rectParent = rectDisplay;
     }
 
     {
         // we were explicitly asked to centre this window on the entire screen
         // or if we have no parent anyhow and so can't centre on it
         rectParent = rectDisplay;
     }
 

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

     if ( !(dir & wxBOTH) )
         dir |= wxBOTH; // if neither is specified, center in both directions
 
     if ( !(dir & wxBOTH) )
         dir |= wxBOTH; // if neither is specified, center in both directions
 


@@ -377,7 +374,7 @@ void wxTopLevelWindowBase::DoLayout()
     else
     {
         // do we have _exactly_ one child?
     else
     {
         // do we have _exactly_ one child?

-        wxWindow *child = (wxWindow *)NULL;
+        wxWindow *child = NULL;

         for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
               node;
               node = node->GetNext() )
         for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
               node;
               node = node->GetNext() )