wxTopLevelWindows.DeleteObject(this);
+ // delete any our top level children which are still pending for deletion
+ // immediately: this could happen if a child (e.g. a temporary dialog
+ // created with this window as parent) was Destroy()'d) while this window
+ // was deleted directly (with delete, or maybe just because it was created
+ // on the stack) immediately afterwards and before the child TLW was really
+ // destroyed -- not destroying it now would leave it alive with a dangling
+ // parent pointer and result in a crash later
+ for ( wxObjectList::iterator i = wxPendingDelete.begin();
+ i != wxPendingDelete.end();
+ )
+ {
+ wxWindow * const win = wxDynamicCast(*i, wxWindow);
+ if ( win && win->GetParent() == this )
+ {
+ wxPendingDelete.erase(i);
+
+ delete win;
+
+ // deleting it invalidated the list (and not only one node because
+ // it could have resulted in deletion of other objects to)
+ i = wxPendingDelete.begin();
+ }
+ else
+ {
+ ++i;
+ }
+ }
+
if ( IsLastBeforeExit() )
{
// no other (important) windows left, quit the app
if ( !wxPendingDelete.Member(this) )
wxPendingDelete.Append(this);
- if (wxTopLevelWindows.GetCount() > 1)
+ // normally we want to hide the window immediately so that it doesn't get
+ // stuck on the screen while it's being destroyed, however we shouldn't
+ // hide the last visible window as then we might not get any idle events
+ // any more as no events will be sent to the hidden window and without idle
+ // events we won't prune wxPendingDelete list and the application won't
+ // terminate
+ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+ end = wxTopLevelWindows.end();
+ i != end;
+ ++i )
{
- // Hide it immediately. This should
- // not be done if this TLW is the
- // only one left since we then would
- // risk not to get any idle events
- // at all anymore during which we
- // could delete any pending events.
- Hide();
+ wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+ if ( win != this && win->IsShown() )
+ {
+ // there remains at least one other visible TLW, we can hide this
+ // one
+ Hide();
+
+ break;
+ }
}
return true;
// 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
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
// wxTopLevelWindow geometry
// ----------------------------------------------------------------------------
-void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
{
- GetPosition(x,y);
- GetSize(w,h);
+ SetSizeHints(minSize, GetMaxSize());
}
-wxSize wxTopLevelWindowBase::GetMaxSize() const
+void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
{
- wxSize size( GetMaxWidth(), GetMaxHeight() );
- int w, h;
-
- wxClientDisplayRect( 0, 0, &w, &h );
-
- if( size.GetWidth() == wxDefaultCoord )
- size.SetWidth( w );
-
- if( size.GetHeight() == wxDefaultCoord )
- size.SetHeight( h );
+ SetSizeHints(GetMinSize(), maxSize);
+}
- return size;
+void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+{
+ GetPosition(x,y);
+ GetSize(w,h);
}
/* static */
wxSize wxTopLevelWindowBase::GetDefaultSize()
{
wxSize size = wxGetClientDisplayRect().GetSize();
-
+#ifndef __WXOSX_IPHONE__
// create proportionally bigger windows on small screens
if ( size.x >= 1024 )
size.x = 400;
size.y *= 2;
size.y /= 3;
}
-
+#endif
return size;
}
{
// 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
- int nDisplay = wxDisplay::GetFromWindow(this);
+ // we need the display rect anyhow so store it first: notice that we should
+ // be centered on the same display as our parent window, the display of
+ // this window itself is not really defined yet
+ int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this);
wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
const wxRect rectDisplay(dpy.GetClientArea());
// 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.Inside(rectParent.GetTopLeft()) &&
- !rectParent.Inside(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 explicitely asked to centre this window on the entire screen
+ // 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
// the new window rect candidate
- wxRect rect = GetRect().CentreIn(rectParent, dir);
+ wxRect rect = GetRect().CentreIn(rectParent, dir & ~wxCENTRE_ON_SCREEN);
// we don't want to place the window off screen if Centre() is called as
// this is (almost?) never wanted and it would be very difficult to prevent
// it from happening from the user code if we didn't check for it here
- if ( rectDisplay.Inside(rect.GetTopLeft()) )
+ if ( !rectDisplay.Contains(rect.GetTopLeft()) )
{
- if ( !rectDisplay.Inside(rect.GetBottomRight()) )
- {
- // check if we can move the window so that the bottom right corner
- // is visible without hiding the top left one
- int dx = rectDisplay.GetRight() - rect.GetRight();
- int dy = rectDisplay.GetBottom() - rect.GetBottom();
- rect.Offset(dx, dy);
- }
- //else: the window top left and bottom right corner are both visible,
- // although the window might still be not entirely on screen (with
- // 2 staggered displays for example) we wouldn't be able to
- // improve the layout much in such case, so just leave it as is
+ // move the window just enough to make the corner visible
+ int dx = rectDisplay.GetLeft() - rect.GetLeft();
+ int dy = rectDisplay.GetTop() - rect.GetTop();
+ rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0);
}
- else // make top left corner visible
- {
- if ( rect.x < rectDisplay.x )
- rect.x = rectDisplay.x;
- if ( rect.y < rectDisplay.y )
- rect.y = rectDisplay.y;
+ if ( !rectDisplay.Contains(rect.GetBottomRight()) )
+ {
+ // do the same for this corner too
+ int dx = rectDisplay.GetRight() - rect.GetRight();
+ int dy = rectDisplay.GetBottom() - rect.GetBottom();
+ rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
}
+ // the window top left and bottom right corner are both visible now and
+ // although the window might still be not entirely on screen (with 2
+ // staggered displays for example) we wouldn't be able to improve the
+ // layout much in such case, so we stop here
+
// -1 could be valid coordinate here if there are several displays
SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
}
#endif
}
+// ----------------------------------------------------------------------------
+// icons
+// ----------------------------------------------------------------------------
+
+wxIcon wxTopLevelWindowBase::GetIcon() const
+{
+ return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 );
+}
+
+void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
+{
+ // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
+ // have any icon), but adding an invalid icon to wxIconBundle is not
+ wxIconBundle icons;
+ if ( icon.IsOk() )
+ icons.AddIcon(icon);
+
+ SetIcons(icons);
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
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() )
int clientW, clientH;
DoGetClientSize(&clientW, &clientH);
- // for whatever reasons, wxGTK wants to have a small offset - it
- // probably looks better with it?
-#ifdef __WXGTK__
- static const int ofs = 1;
-#else
- static const int ofs = 0;
-#endif
-
- child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
+ child->SetSize(0, 0, clientW, clientH);
}
}
}
projects / wxWidgets.git / blobdiff