don't crash if one of GetAllCommands() parameters is NULL (coverity checker CID 11)

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 5ce909c799f86cc21ea2978d8d8f6709d5b4bd75..c519fbc7c9005e0c8fdfc28c2a347a2ae1725643 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toplevelbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,6 +29,8 @@
     #include "wx/app.h"
 #endif // WX_PRECOMP
 
+#include "wx/display.h"
+
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
@@ -155,6 +153,35 @@ wxSize wxTopLevelWindowBase::GetDefaultSize()
     return size;
 }
 
+void wxTopLevelWindowBase::DoCentre(int dir)
+{
+    wxRect rectCentre;
+    if ( !(dir & wxCENTRE_ON_SCREEN) && GetParent() )
+    {
+        // centre on parent window
+        rectCentre = GetParent()->GetRect();
+    }
+    else
+    {
+        // we were explicitely asked to centre this window on the entire screen
+        // or if we have no parent anyhow and so can't centre on it
+#if wxUSE_DISPLAY
+        const int nDisplay = wxDisplay::GetFromWindow(this);
+        if ( nDisplay != wxNOT_FOUND )
+        {
+            rectCentre = wxDisplay(nDisplay).GetGeometry();
+        }
+        else
+#endif // wxUSE_DISPLAY
+        {
+            wxDisplaySize(&rectCentre.width, &rectCentre.height);
+        }
+    }
+
+    // window may be at -1 if it's centered on a secondary display, for example
+    SetSize(GetRect().CentreIn(rectCentre, dir), wxSIZE_ALLOW_MINUS_ONE);
+}
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's
@@ -261,9 +288,12 @@ bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized)
 // do the window-specific processing after processing the update event
 void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
-    if ( event.GetSetEnabled() )
-        Enable(event.GetEnabled());
+    // call inherited, but skip the wxControl's version, and call directly the
+    // wxWindow's one instead, because the only reason why we are overriding this
+    // function is that we want to use SetTitle() instead of wxControl::SetLabel()
+    wxWindowBase::DoUpdateWindowUI(event);
 
+    // update title
     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetTitle() )