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

Various changes to make pop up menus work

Browse Source 
under X11.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-03-09 20:22:44 +00:00
parent 96c21216a6
commit ee3510132b
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/popupcmn.cpp
View File

@@ -34,6 +34,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/combobox.h" // wxComboControl #include "wx/combobox.h" // wxComboControl
#include "wx/log.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
@@ -256,13 +257,13 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
// otherwise everything else breaks down // otherwise everything else breaks down
m_focus = FindFocus(); m_focus = FindFocus();
if ( m_focus ) if ( m_focus )
#endif // __WXMSW__
{ {
delete m_handlerFocus; delete m_handlerFocus;
m_handlerFocus = new wxPopupFocusHandler(this); m_handlerFocus = new wxPopupFocusHandler(this);
m_focus->PushEventHandler(m_handlerFocus); m_focus->PushEventHandler(m_handlerFocus);
} }
#endif // __WXMSW__
} }
void wxPopupTransientWindow::Dismiss() void wxPopupTransientWindow::Dismiss()

12
src/univ/menu.cpp
View File

@@ -257,6 +257,8 @@ public:
} }
else else
{ {
// return FALSE;
return wxEvtHandler::ProcessEvent(event); return wxEvtHandler::ProcessEvent(event);
} }
} }
@@ -1251,7 +1253,9 @@ void wxMenu::OnDismiss(bool dismissParent)
wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") ); wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") );
m_invokingWindow->DismissPopupMenu(); m_invokingWindow->DismissPopupMenu();
SetInvokingWindow(NULL);
// Why reset it here? We need it for sending the event to...
// SetInvokingWindow(NULL);
} }
} }
} }
@@ -2355,6 +2359,9 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
#endif // 0 #endif // 0
menu->SetInvokingWindow(this); menu->SetInvokingWindow(this);
// wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );
menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0, 0)); menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0, 0));
// this is not very useful if the menu was popped up because of the mouse // this is not very useful if the menu was popped up because of the mouse
@@ -2390,9 +2397,6 @@ void wxWindow::DismissPopupMenu()
{ {
wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") ); wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") );
char *crash = NULL;
(*crash) = 0;
ms_evtLoopPopup->Exit(); ms_evtLoopPopup->Exit();
} }

2
src/x11/app.cpp
View File

@@ -661,7 +661,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
g_nextFocus = win; g_nextFocus = win;
win->SetFocus(); win->SetFocus();
return TRUE; // return TRUE;
} }
} }