[lmi-commits] [lmi] master a738061 3/4: Accommodate default (non-STL) wx build

[Greg Chicares]

branch: master
commit a7380613251f1a9dcf8d9981a9f32faff3f57114
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Accommodate default (non-STL) wx build
---
 skeleton.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/skeleton.cpp b/skeleton.cpp
index dc0d610..3f48de4 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -1369,12 +1369,12 @@ void Skeleton::UpdateViews()
 {
     wxBusyCursor wait;
 
-    // Assignment implicitly ensures that this is not a wx legacy
-    // container, and thus that std::list operations are valid.
-    std::list<wxWindow*> z = frame_->GetChildren();
-    wxMDIChildFrame*     a = frame_->GetActiveChild();
+    // Make a local copy of the list for modification.
     // Bring any active child to front so it's updated first.
     // It doesn't matter here if it's null: that's filtered below.
+    wxMDIChildFrame*     a = frame_->GetActiveChild();
+    wxWindowList const&  y = frame_->GetChildren();
+    std::list<wxWindow*> z(y.begin(), y.end());
     z.remove(a);
     z.push_front(a);