From 46ab9cb041d95c80327804a385663eb9dab016ee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 18 Jul 2015 15:32:00 +0200 Subject: [PATCH] Rename HandleMiniaturize() to have OSX prefix and make it non-virtual. This method doesn't really have to be virtual and this change will allow to backport the commit adding wxIconizeEvent generation to 3.0 branch. See #16718. --- include/wx/osx/nonownedwnd.h | 3 ++- src/osx/cocoa/nonownedwnd.mm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 57e97d66e7..9b0d3bea4e 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -113,7 +113,8 @@ public: virtual void HandleResized( double timestampsec ); virtual void HandleMoved( double timestampsec ); virtual void HandleResizing( double timestampsec, wxRect* rect ); - virtual void HandleMiniaturize( double WXUNUSED(timestampsec), bool miniaturized ); + + void OSXHandleMiniaturize(double WXUNUSED(timestampsec), bool miniaturized); void WindowWasPainted(); diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index a66ec01b67..a13efdabbf 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -422,7 +422,7 @@ extern int wxOSXGetIdFromSelector(SEL action ); if ( windowimpl ) { if ( wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer() ) - wxpeer->HandleMiniaturize(0, [window isMiniaturized]); + wxpeer->OSXHandleMiniaturize(0, [window isMiniaturized]); } } @@ -433,7 +433,7 @@ extern int wxOSXGetIdFromSelector(SEL action ); if ( windowimpl ) { if ( wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer() ) - wxpeer->HandleMiniaturize(0, [window isMiniaturized]); + wxpeer->OSXHandleMiniaturize(0, [window isMiniaturized]); } }