Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename HandleMiniaturize() to have OSX prefix and make it non-virtual.

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2015-07-18 15:32:00 +02:00
parent 9bedba0bf3
commit 46ab9cb041
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/osx/nonownedwnd.h
View File

@@ -113,7 +113,8 @@ public:
virtual void HandleResized( double timestampsec ); virtual void HandleResized( double timestampsec );
virtual void HandleMoved( double timestampsec ); virtual void HandleMoved( double timestampsec );
virtual void HandleResizing( double timestampsec, wxRect* rect ); virtual void HandleResizing( double timestampsec, wxRect* rect );
virtual void HandleMiniaturize( double WXUNUSED(timestampsec), bool miniaturized );
void OSXHandleMiniaturize(double WXUNUSED(timestampsec), bool miniaturized);
void WindowWasPainted(); void WindowWasPainted();

4
src/osx/cocoa/nonownedwnd.mm
View File

@@ -422,7 +422,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
if ( windowimpl ) if ( windowimpl )
{ {
if ( wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer() ) 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 ( windowimpl )
{ {
if ( wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer() ) if ( wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer() )
wxpeer->HandleMiniaturize(0, [window isMiniaturized]); wxpeer->OSXHandleMiniaturize(0, [window isMiniaturized]);
} }
} }