Borland compiler does not like a variable called except

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index a449be57d556adef49cf88d956528cfc3af903df..3aec290a2a484455bfdd713621942c01b5b7738b 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -369,16 +369,16 @@ static wxPaneInfo* FindPaneInDock(const wxDockInfo& dock, wxWindow* window)
 }
 
 // RemovePaneFromDocks() removes a pane window from all docks
 }
 
 // RemovePaneFromDocks() removes a pane window from all docks

-// with a possible exception specified by parameter "except"
+// with a possible exception specified by parameter "ex_cept"

 static void RemovePaneFromDocks(wxDockInfoArray& docks,
                                 wxPaneInfo& pane,
 static void RemovePaneFromDocks(wxDockInfoArray& docks,
                                 wxPaneInfo& pane,

-                                wxDockInfo* except = NULL)
+                                wxDockInfo* ex_cept  = NULL  )

 {
     int i, dock_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
         wxDockInfo& d = docks.Item(i);
 {
     int i, dock_count;
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
     {
         wxDockInfo& d = docks.Item(i);

-        if (&d == except)
+        if (&d == ex_cept)

             continue;
         wxPaneInfo* pi = FindPaneInDock(d, pane.window);
         if (pi)
             continue;
         wxPaneInfo* pi = FindPaneInDock(d, pane.window);
         if (pi)