From 9e83d415ed02c0e8fe8ad35b18cc538c66faf105 Mon Sep 17 00:00:00 2001 From: John Roberts Date: Wed, 31 May 2017 19:13:21 +0800 Subject: [PATCH] Remove unused global variable left over from Carbon This "g_MacLastWindow" was only used in Carbon code and should have been removed in 5ba67c67e47d069f65d648ab16dfc505c5400bfc. --- src/osx/nonownedwnd_osx.cpp | 2 -- src/osx/window_osx.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp index dd952320ca..d14c023855 100644 --- a/src/osx/nonownedwnd_osx.cpp +++ b/src/osx/nonownedwnd_osx.cpp @@ -36,8 +36,6 @@ // trace mask for activation tracing messages #define TRACE_ACTIVATE "activation" -wxWindow* g_MacLastWindow = NULL ; - clock_t wxNonOwnedWindow::s_lastFlush = 0; // unified title and toolbar constant - not in Tiger headers, so we duplicate it here diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index f02518526d..1745608123 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -266,9 +266,6 @@ wxWindowMac::~wxWindowMac() tlw->SetDefaultItem(NULL); } - if ( g_MacLastWindow == this ) - g_MacLastWindow = NULL ; - #ifndef __WXUNIVERSAL__ wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ; if ( frame )