include compiler name in plugin DLL name on Windows

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 61402fabf07df6ae8a03f26cfd473fc83ee13881..9a1a983162f8922f7580fe9508b4ddd674c3aa88 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "windowbase.h"
 #endif
 
     #pragma implementation "windowbase.h"
 #endif
 


@@ -114,7 +114,6 @@ void wxWindowBase::InitBase()
     // no window yet, no parent nor children
     m_parent = (wxWindow *)NULL;
     m_windowId = -1;
     // no window yet, no parent nor children
     m_parent = (wxWindow *)NULL;
     m_windowId = -1;

-    m_children.DeleteContents( FALSE ); // don't auto delete node data

 
     // no constraints on the minimal window size
     m_minWidth =
 
     // no constraints on the minimal window size
     m_minWidth =


@@ -263,7 +262,7 @@ wxWindowBase::~wxWindowBase()
 
     // Just in case we've loaded a top-level window via LoadNativeDialog but
     // we weren't a dialog class
 
     // Just in case we've loaded a top-level window via LoadNativeDialog but
     // we weren't a dialog class

-    wxTopLevelWindows.DeleteObject(this);
+    wxTopLevelWindows.DeleteObject((wxWindow*)this);

 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 


@@ -344,7 +343,7 @@ bool wxWindowBase::Close(bool force)
 
 bool wxWindowBase::DestroyChildren()
 {
 
 bool wxWindowBase::DestroyChildren()
 {

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( ;; )
     {
         // we iterate until the list becomes empty
     for ( ;; )
     {
         // we iterate until the list becomes empty


@@ -520,7 +519,7 @@ wxSize wxWindowBase::DoGetBestSize() const
         int maxX = 0,
             maxY = 0;
 
         int maxX = 0,
             maxY = 0;
 

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -554,7 +553,7 @@ wxSize wxWindowBase::DoGetBestSize() const
         int maxX = 0,
             maxY = 0;
 
         int maxX = 0,
             maxY = 0;
 

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -708,9 +707,9 @@ void wxWindowBase::AddChild(wxWindowBase *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
     // 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") );
+    wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), _T("AddChild() called twice") );

 
 

-    GetChildren().Append(child);
+    GetChildren().Append((wxWindow*)child);

     child->SetParent(this);
 }
 
     child->SetParent(this);
 }
 


@@ -718,8 +717,8 @@ void wxWindowBase::RemoveChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't remove a NULL child") );
 
 {
     wxCHECK_RET( child, wxT("can't remove a NULL child") );
 

-    GetChildren().DeleteObject(child);
-    child->SetParent((wxWindow *)NULL);
+    GetChildren().DeleteObject((wxWindow *)child);
+    child->SetParent(NULL);

 }
 
 bool wxWindowBase::Reparent(wxWindowBase *newParent)
 }
 
 bool wxWindowBase::Reparent(wxWindowBase *newParent)


@@ -738,7 +737,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     }
     else
     {
     }
     else
     {

-        wxTopLevelWindows.DeleteObject(this);
+        wxTopLevelWindows.DeleteObject((wxWindow *)this);

     }
 
     // add it to the new one
     }
 
     // add it to the new one


@@ -748,7 +747,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     }
     else
     {
     }
     else
     {

-        wxTopLevelWindows.Append(this);
+        wxTopLevelWindows.Append((wxWindow *)this);

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -978,6 +977,17 @@ bool wxWindowBase::IsExposed(int x, int y, int w, int h) const
     return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
 }
 
     return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
 }
 

+void wxWindowBase::ClearBackground()
+{
+    // wxGTK uses its own version, no need to add never used code
+#ifndef __WXGTK__
+    wxClientDC dc((wxWindow *)this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
+#endif // __WXGTK__
+}
+

 // ----------------------------------------------------------------------------
 // find child window by id or name
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // find child window by id or name
 // ----------------------------------------------------------------------------


@@ -988,7 +998,7 @@ wxWindow *wxWindowBase::FindWindow( long id )
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();


@@ -1004,7 +1014,7 @@ wxWindow *wxWindowBase::FindWindow( const wxString& name )
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();


@@ -1060,7 +1070,7 @@ wxWindow *wxFindWindowRecursively(const wxWindow *parent,
             return (wxWindow *)parent;
 
         // It wasn't, so check all its children
             return (wxWindow *)parent;
 
         // It wasn't, so check all its children

-        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -1090,7 +1100,7 @@ wxWindow *wxFindWindowHelper(const wxWindow *parent,
     }
 
     // start at very top of wx's windows
     }
 
     // start at very top of wx's windows

-    for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -1142,7 +1152,7 @@ void wxWindowBase::MakeModal(bool modal)
     // Disable all other windows
     if ( IsTopLevel() )
     {
     // Disable all other windows
     if ( IsTopLevel() )
     {

-        wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+        wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1159,7 +1169,7 @@ bool wxWindowBase::Validate()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();


@@ -1184,7 +1194,7 @@ bool wxWindowBase::TransferDataToWindow()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();


@@ -1218,7 +1228,7 @@ bool wxWindowBase::TransferDataFromWindow()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();


@@ -1409,15 +1419,15 @@ void wxWindowBase::AddConstraintReference(wxWindowBase *otherWin)
 {
     if ( !m_constraintsInvolvedIn )
         m_constraintsInvolvedIn = new wxWindowList;
 {
     if ( !m_constraintsInvolvedIn )
         m_constraintsInvolvedIn = new wxWindowList;

-    if ( !m_constraintsInvolvedIn->Find(otherWin) )
-        m_constraintsInvolvedIn->Append(otherWin);
+    if ( !m_constraintsInvolvedIn->Find((wxWindow *)otherWin) )
+        m_constraintsInvolvedIn->Append((wxWindow *)otherWin);

 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
 {
     if ( m_constraintsInvolvedIn )
 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
 {
     if ( m_constraintsInvolvedIn )

-        m_constraintsInvolvedIn->DeleteObject(otherWin);
+        m_constraintsInvolvedIn->DeleteObject((wxWindow *)otherWin);

 }
 
 // Reset any constraints that mention this window
 }
 
 // Reset any constraints that mention this window


@@ -1425,7 +1435,7 @@ void wxWindowBase::DeleteRelatedConstraints()
 {
     if ( m_constraintsInvolvedIn )
     {
 {
     if ( m_constraintsInvolvedIn )
     {

-        wxWindowList::Node *node = m_constraintsInvolvedIn->GetFirst();
+        wxWindowList::compatibility_iterator node = m_constraintsInvolvedIn->GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1444,8 +1454,8 @@ void wxWindowBase::DeleteRelatedConstraints()
                 constr->centreY.ResetIfWin(this);
             }
 
                 constr->centreY.ResetIfWin(this);
             }
 

-            wxWindowList::Node *next = node->GetNext();
-            delete node;
+            wxWindowList::compatibility_iterator next = node->GetNext();
+            m_constraintsInvolvedIn->Erase(node);

             node = next;
         }
 
             node = next;
         }
 


@@ -1559,7 +1569,7 @@ bool wxWindowBase::DoPhase(int phase)
         int noChanges = 0;
 
         // loop over all children setting their constraints
         int noChanges = 0;
 
         // loop over all children setting their constraints

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -1612,7 +1622,7 @@ void wxWindowBase::ResetConstraints()
         constr->centreY.SetDone(FALSE);
     }
 
         constr->centreY.SetDone(FALSE);
     }
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow *win = node->GetData();
     while (node)
     {
         wxWindow *win = node->GetData();


@@ -1654,7 +1664,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
 
     if ( recurse )
     {
 
     if ( recurse )
     {

-        wxWindowList::Node *node = GetChildren().GetFirst();
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1782,7 +1792,7 @@ void wxWindowBase::UpdateWindowUI(long flags)
 
     if (flags & wxUPDATE_UI_RECURSE)
     {
 
     if (flags & wxUPDATE_UI_RECURSE)
     {

-        wxWindowList::Node* node = GetChildren().GetFirst();
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

         while (node)
         {
             wxWindow* child = (wxWindow*) node->GetData();
         while (node)
         {
             wxWindow* child = (wxWindow*) node->GetData();


@@ -1831,12 +1841,14 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 #endif
 }
 
 #endif
 }
 

+#if 0

 // call internal idle recursively
 // call internal idle recursively

+// may be obsolete (wait until OnIdle scheme stabilises)

 void wxWindowBase::ProcessInternalIdle()
 {
     OnInternalIdle();
 
 void wxWindowBase::ProcessInternalIdle()
 {
     OnInternalIdle();
 

-    wxWindowList::Node  *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow *child = node->GetData();
     while (node)
     {
         wxWindow *child = node->GetData();


@@ -1844,6 +1856,7 @@ void wxWindowBase::ProcessInternalIdle()
         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // dialog units translations
 
 // ----------------------------------------------------------------------------
 // dialog units translations


@@ -1882,7 +1895,7 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 // propagate the colour change event to the subwindows
 void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // propagate the colour change event to the subwindows
 void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         // Only propagate to non-top-level windows
     while ( node )
     {
         // Only propagate to non-top-level windows


@@ -2004,6 +2017,7 @@ wxAccessible* wxWindowBase::CreateAccessible()
 
 #endif
 
 
 #endif
 

+#if !wxUSE_STL

 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------


@@ -2012,6 +2026,7 @@ void wxWindowListNode::DeleteData()
 {
     delete (wxWindow *)GetData();
 }
 {
     delete (wxWindow *)GetData();
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // borders
 
 // ----------------------------------------------------------------------------
 // borders


@@ -2159,10 +2174,9 @@ bool wxWindowBase::TryValidator(wxEvent& event)
 
 bool wxWindowBase::TryParent(wxEvent& event)
 {
 
 bool wxWindowBase::TryParent(wxEvent& event)
 {

-    // Carry on up the parent-child hierarchy, but only if event is a command
-    // event: it wouldn't make sense for a parent to receive a child's size
-    // event, for example
-    if ( event.IsCommandEvent() )
+    // carry on up the parent-child hierarchy if the propgation count hasn't
+    // reached zero yet
+    if ( event.ShouldPropagate() )

     {
         // honour the requests to stop propagation at this window: this is
         // used by the dialogs, for example, to prevent processing the events
     {
         // honour the requests to stop propagation at this window: this is
         // used by the dialogs, for example, to prevent processing the events


@@ -2172,7 +2186,11 @@ bool wxWindowBase::TryParent(wxEvent& event)
         {
             wxWindow *parent = GetParent();
             if ( parent && !parent->IsBeingDeleted() )
         {
             wxWindow *parent = GetParent();
             if ( parent && !parent->IsBeingDeleted() )

+            {
+                wxPropagateOnce propagateOnce(event);
+

                 return parent->GetEventHandler()->ProcessEvent(event);
                 return parent->GetEventHandler()->ProcessEvent(event);

+            }

         }
     }
 
         }
     }
 


@@ -2223,7 +2241,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
     {
         if (elementId <= (int) GetWindow()->GetChildren().GetCount())
         {
     {
         if (elementId <= (int) GetWindow()->GetChildren().GetCount())
         {

-            win = (wxWindow*) GetWindow()->GetChildren().Nth(elementId-1)->GetData();
+            win = GetWindow()->GetChildren().Item(elementId-1)->GetData();

         }
         else
             return wxACC_FAIL;
         }
         else
             return wxACC_FAIL;


@@ -2271,7 +2289,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
     case wxNAVDIR_DOWN:
     case wxNAVDIR_NEXT:
         {
     case wxNAVDIR_DOWN:
     case wxNAVDIR_NEXT:
         {

-            wxWindowList::Node *node = NULL;
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();

             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window
             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window


@@ -2284,12 +2303,12 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())

-                    node = (wxWindowList::Node*) GetWindow()->GetChildren().Nth(fromId-1);
+                    node = GetWindow()->GetChildren().Item(fromId-1);

             }
 
             if (node && node->GetNext())
             {
             }
 
             if (node && node->GetNext())
             {

-                wxWindow* nextWindow = (wxWindow*) node->GetNext()->Data();
+                wxWindow* nextWindow = node->GetNext()->GetData();

                 *toObject = nextWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }
                 *toObject = nextWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }


@@ -2300,7 +2319,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
     case wxNAVDIR_UP:
     case wxNAVDIR_PREVIOUS:
         {
     case wxNAVDIR_UP:
     case wxNAVDIR_PREVIOUS:
         {

-            wxWindowList::Node *node = NULL;
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();

             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window
             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window


@@ -2313,12 +2333,12 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())

-                    node = (wxWindowList::Node*) GetWindow()->GetChildren().Nth(fromId-1);
+                    node = GetWindow()->GetChildren().Item(fromId-1);

             }
 
             if (node && node->GetPrevious())
             {
             }
 
             if (node && node->GetPrevious())
             {

-                wxWindow* previousWindow = (wxWindow*) node->GetPrevious()->Data();
+                wxWindow* previousWindow = node->GetPrevious()->GetData();

                 *toObject = previousWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }
                 *toObject = previousWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }


@@ -2391,7 +2411,7 @@ wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child)
     if (childId > (int) GetWindow()->GetChildren().GetCount())
         return wxACC_FAIL;
 
     if (childId > (int) GetWindow()->GetChildren().GetCount())
         return wxACC_FAIL;
 

-    wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().Nth(childId-1)->GetData();
+    wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData();

     *child = childWindow->GetOrCreateAccessible();
     if (*child)
         return wxACC_OK;
     *child = childWindow->GetOrCreateAccessible();
     if (*child)
         return wxACC_OK;