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

Fix wxGTK compilation in wxUSE_MENUS==0 case.

Browse Source 
Add missing check for it to wxWindow::DoFindFocus().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-15 15:14:49 +00:00
parent 45c103404c
commit 4ec2eca1e8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/window.cpp
View File

@@ -2088,12 +2088,14 @@ void wxWindowGTK::GTKHandleUnrealize()
wxWindow *wxWindowBase::DoFindFocus() wxWindow *wxWindowBase::DoFindFocus()
{ {
#if wxUSE_MENUS
// For compatibility with wxMSW, pretend that showing a popup menu doesn't // For compatibility with wxMSW, pretend that showing a popup menu doesn't
// change the focus and that it remains on the window showing it, even // change the focus and that it remains on the window showing it, even
// though the real focus does change in GTK. // though the real focus does change in GTK.
extern wxMenu *wxCurrentPopupMenu; extern wxMenu *wxCurrentPopupMenu;
if ( wxCurrentPopupMenu ) if ( wxCurrentPopupMenu )
return wxCurrentPopupMenu->GetInvokingWindow(); return wxCurrentPopupMenu->GetInvokingWindow();
#endif // wxUSE_MENUS
wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus; wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus;
// the cast is necessary when we compile in wxUniversal mode // the cast is necessary when we compile in wxUniversal mode