Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

[wxWidgets.git] / src / osx / nonownedwnd_osx.cpp

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index c5c7419c20e30fee21bf65f5b3be3b995aae98ef..e2543dff277eb3a9579cabba74ac094da9bbdc99 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -52,14 +52,14 @@ static MacWindowMap wxWinMacWindowList;
 wxNonOwnedWindow* wxNonOwnedWindow::GetFromWXWindow( WXWindow win )
 {
     wxNonOwnedWindowImpl* impl = wxNonOwnedWindowImpl::FindFromWXWindow(win);
-    
+
     return ( impl != NULL ? impl->GetWXPeer() : NULL ) ;
 }
 
 wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::FindFromWXWindow (WXWindow window)
 {
     MacWindowMap::iterator node = wxWinMacWindowList.find(window);
-    
+
     return (node == wxWinMacWindowList.end()) ? NULL : node->second;
 }
 
@@ -81,7 +81,7 @@ void wxNonOwnedWindowImpl::Associate( WXWindow window, wxNonOwnedWindowImpl *imp
     // adding NULL WindowRef is (first) surely a result of an error and
     // nothing else :-)
     wxCHECK_RET( window != (WXWindow) NULL, wxT("attempt to add a NULL WindowRef to window list") );
-    
+
     wxWinMacWindowList[window] = impl;
 }
 
@@ -115,14 +115,26 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
     m_isShown = false;
 
     // use the appropriate defaults for the position and size if necessary
-    wxPoint pos(posOrig);
-    if ( !pos.IsFullySpecified() )
-        pos.SetDefaults(wxGetClientDisplayRect().GetPosition());
-
     wxSize size(sizeOrig);
     if ( !size.IsFullySpecified() )
         size.SetDefaults(wxTopLevelWindow::GetDefaultSize());
 
+    wxPoint pos(posOrig);
+    if ( !pos.IsFullySpecified() )
+    {
+        wxRect rectWin = wxRect(size).CentreIn(wxGetClientDisplayRect());
+
+        // The size of the window is often not really known yet, TLWs are often
+        // created with some small initial size and later are fitted to contain
+        // their children so centering the window will show it too much to the
+        // right and bottom, adjust for it by putting it more to the left and
+        // center.
+        rectWin.x /= 2;
+        rectWin.y /= 2;
+
+        pos.SetDefaults(rectWin.GetPosition());
+    }
+
     // create frame.
     m_nowpeer = wxNonOwnedWindowImpl::CreateNonOwnedWindow
                 (
@@ -151,9 +163,9 @@ bool wxNonOwnedWindow::Create(wxWindow *parent, WXWindow nativeWindow)
 {
     if ( parent )
         parent->AddChild(this);
-    
+
     SubclassWin(nativeWindow);
-    
+
     return true;
 }
 
@@ -174,8 +186,8 @@ void wxNonOwnedWindow::UnsubclassWin()
 
     if ( GetParent() )
         GetParent()->RemoveChild(this);
-    
-    wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;    
+
+    wxNonOwnedWindowImpl::RemoveAssociations(m_nowpeer) ;
     wxDELETE(m_nowpeer);
     wxDELETE(m_peer);
     m_isNativeWindowWrapper = false;
@@ -200,7 +212,7 @@ wxNonOwnedWindow::~wxNonOwnedWindow()
 bool wxNonOwnedWindow::Destroy()
 {
     WillBeDestroyed();
-    
+
     return wxWindow::Destroy();
 }
 
@@ -266,9 +278,9 @@ void wxNonOwnedWindow::SetWindowStyleFlag(long flags)
 {
     if (flags == GetWindowStyleFlag())
         return;
-        
+
     wxWindow::SetWindowStyleFlag(flags);
-    
+
     if (m_nowpeer)
         m_nowpeer->SetWindowStyleFlag(flags);
 }
@@ -455,7 +467,14 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
         return;
 
     int left, top, w, h;
+    // under iphone with a translucent status bar the m_nowpeer returns the
+    // inner area, while the content area extends under the translucent
+    // status bar, therefore we use the content view's area
+#ifdef __WXOSX_IPHONE__
+    m_peer->GetContentArea(left, top, w, h);
+#else
     m_nowpeer->GetContentArea(left, top, w, h);
+#endif
     
     if (width)
        *width = w ;
@@ -485,7 +504,7 @@ bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
                  wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     m_shape = region;
-    
+
     // The empty region signifies that the shape
     // should be removed from the window.
     if ( region.IsEmpty() )