Added chapter on collection and container classes to contents

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index e3c669216f72df38cfb335b1e6d0d84dfa79356c..e40b8f23c492bf6204faeebdb9c616a82aa1065b 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/settings.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"

+    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS
 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS


@@ -124,11 +125,7 @@ void wxWindowBase::InitBase()
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 
     // GRG, changed Mar/2000
     m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
 
     // GRG, changed Mar/2000

-#if 0 // !defined(__WXMAC__) && !defined(__WXGTK__)
-    m_font = *wxSWISS_FONT;         //      and this?
-#else

     m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
     m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

-#endif

     // no style bits
     m_exStyle =
     m_windowStyle = 0;
     // no style bits
     m_exStyle =
     m_windowStyle = 0;


@@ -319,13 +316,32 @@ bool wxWindowBase::DestroyChildren()
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {

+    // the position/size of the parent window or of the entire screen
+    wxPoint posParent;

     int widthParent, heightParent;
 
     int widthParent, heightParent;
 

-    wxWindow *parent = GetParent();
-    if ( !parent )
+    wxWindow *parent = NULL;
+
+    if ( !(direction & wxCENTRE_ON_SCREEN) )

     {
     {

-        // no other choice
-        direction |= wxCENTRE_ON_SCREEN;
+        // find the parent to centre this window on: it should be the
+        // immediate parent for the controls but the top level parent for the
+        // top level windows (like dialogs)
+        parent = GetParent();
+        if ( IsTopLevel() )
+        {
+            while ( parent && !parent->IsTopLevel() )
+            {
+                parent = parent->GetParent();
+            }
+        }
+
+        // did we find the parent?
+        if ( !parent )
+        {
+            // no other choice
+            direction |= wxCENTRE_ON_SCREEN;
+        }

     }
 
     if ( direction & wxCENTRE_ON_SCREEN )
     }
 
     if ( direction & wxCENTRE_ON_SCREEN )


@@ -335,8 +351,19 @@ void wxWindowBase::Centre(int direction)
     }
     else
     {
     }
     else
     {

-        // centre inside the parents rectangle
-        parent->GetClientSize(&widthParent, &heightParent);
+        if ( IsTopLevel() )
+        {
+            // centre on the parent
+            parent->GetSize(&widthParent, &heightParent);
+
+            // adjust to the parents position
+            posParent = parent->GetPosition();
+        }
+        else
+        {
+            // centre inside the parents client rectangle
+            parent->GetClientSize(&widthParent, &heightParent);
+        }

     }
 
     int width, height;
     }
 
     int width, height;


@@ -351,20 +378,8 @@ void wxWindowBase::Centre(int direction)
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 

-    // controls are always centered on their parent because it doesn't make
-    // sense to centre them on the screen
-    if ( !(direction & wxCENTRE_ON_SCREEN) || !IsTopLevel() )
-    {
-        // the only chance to get this is to have a not top level window
-        // without parent which shouldn't happen
-        wxCHECK_RET( parent, wxT("this window must have a parent") );
-
-        // adjust to the parents client area origin
-        wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
-
-        xNew += posParent.x;
-        yNew += posParent.y;
-    }
+    xNew += posParent.x;
+    yNew += posParent.y;

 
     // move the centre of this window to this position
     Move(xNew, yNew);
 
     // move the centre of this window to this position
     Move(xNew, yNew);


@@ -394,10 +409,11 @@ wxSize wxWindowBase::DoGetBestSize() const
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();
               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 -
             {
                 // 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;
             }
 
                 continue;
             }
 


@@ -488,6 +504,11 @@ void wxWindowBase::AddChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 

+    // this should never happen and it will lead to a crash later if it does
+    // because RemoveChild() will remove only one node from the children list
+    // and the other(s) one(s) will be left with dangling pointers in them
+    wxASSERT_MSG( !GetChildren().Find(child), _T("AddChild() called twice") );
+

     GetChildren().Append(child);
     child->SetParent(this);
 }
     GetChildren().Append(child);
     child->SetParent(this);
 }


@@ -588,7 +609,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // 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;
     {
         // no change
         return FALSE;


@@ -1413,9 +1434,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 
         wxMessageBox(wxString::Format(
                                       _T(
 
         wxMessageBox(wxString::Format(
                                       _T(

-                                        "       wxWindows Library (%s port)\n"
-                                        "Version %u.%u.%u, compiled at %s %s\n"
-                                        "   Copyright (c) 1995-2000 wxWindows team"
+                                        "       wxWindows Library (%s port)\nVersion %u.%u.%u, compiled at %s %s\n   Copyright (c) 1995-2000 wxWindows team"

                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,
                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,