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
This commit is contained in:
@@ -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,
|
static void RemovePaneFromDocks(wxDockInfoArray& docks,
|
||||||
wxPaneInfo& pane,
|
wxPaneInfo& pane,
|
||||||
wxDockInfo* except = NULL)
|
wxDockInfo* ex_cept = NULL )
|
||||||
{
|
{
|
||||||
int i, dock_count;
|
int i, dock_count;
|
||||||
for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
|
for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
|
||||||
{
|
{
|
||||||
wxDockInfo& d = docks.Item(i);
|
wxDockInfo& d = docks.Item(i);
|
||||||
if (&d == except)
|
if (&d == ex_cept)
|
||||||
continue;
|
continue;
|
||||||
wxPaneInfo* pi = FindPaneInDock(d, pane.window);
|
wxPaneInfo* pi = FindPaneInDock(d, pane.window);
|
||||||
if (pi)
|
if (pi)
|
||||||
|
Reference in New Issue
Block a user