Misc small changes

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index e3c669216f72df38cfb335b1e6d0d84dfa79356c..c8885cb0c49ba12fd59e4bcbe0396f06d30593bd 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -41,6 +41,7 @@
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
+    #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS
@@ -394,10 +395,11 @@ wxSize wxWindowBase::DoGetBestSize() const
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();
-            if ( win->IsTopLevel() )
+            if ( win->IsTopLevel() || wxDynamicCast(win, wxStatusBar) )
             {
                 // dialogs and frames lie in different top level windows -
-                // don't deal with them here
+                // don't deal with them here; as for the status bars, they
+                // don't lie in the client area at all
                 continue;
             }
 
@@ -588,7 +590,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // cursor
-    if ( cursor == m_cursor )
+    if ( m_cursor == cursor )
     {
         // no change
         return FALSE;