Lots of things to make menus and submenus work.
Also added wxPopTransientWindow::CanDismiss() which will be needed for pop-up menus, although that actually still has to be done... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,6 +87,10 @@ public:
|
||||
// hide the window
|
||||
virtual void Dismiss();
|
||||
|
||||
|
||||
virtual bool CanDismiss()
|
||||
{ return TRUE; }
|
||||
|
||||
// called when a mouse is pressed while the popup is shown: return TRUE
|
||||
// from here to prevent its normal processing by the popup (which consists
|
||||
// in dismissing it if the mouse is cilcked outside it)
|
||||
|
@@ -427,8 +427,6 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
|
||||
win = win->GetParent();
|
||||
}
|
||||
|
||||
printf( "Dismiss now.\n" );
|
||||
|
||||
m_popup->DismissAndNotify();
|
||||
}
|
||||
|
||||
|
@@ -45,7 +45,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// default margins around the image
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_X = 0;
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_X = 0; // We should give space for the border, at least.
|
||||
static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
|
||||
|
||||
// ============================================================================
|
||||
|
@@ -124,6 +124,8 @@ class wxPopupMenuWindow : public wxPopupTransientWindow
|
||||
public:
|
||||
wxPopupMenuWindow(wxWindow *parent, wxMenu *menu);
|
||||
|
||||
~wxPopupMenuWindow();
|
||||
|
||||
// override the base class version to select the first item initially
|
||||
virtual void Popup(wxWindow *focus = NULL);
|
||||
|
||||
@@ -308,6 +310,10 @@ wxPopupMenuWindow::wxPopupMenuWindow(wxWindow *parent, wxMenu *menu)
|
||||
SetCursor(wxCURSOR_ARROW);
|
||||
}
|
||||
|
||||
wxPopupMenuWindow::~wxPopupMenuWindow()
|
||||
{
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxPopupMenuWindow current item/node handling
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -1154,6 +1160,10 @@ wxWindow *wxMenu::GetRootWindow() const
|
||||
wxMenu *menu = GetParent();
|
||||
while ( menu )
|
||||
{
|
||||
// We are a submenu of a menu of a menubar
|
||||
if (menu->GetMenuBar())
|
||||
return menu->GetMenuBar();
|
||||
|
||||
win = menu->GetInvokingWindow();
|
||||
if ( win )
|
||||
break;
|
||||
@@ -2380,6 +2390,9 @@ void wxWindow::DismissPopupMenu()
|
||||
{
|
||||
wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") );
|
||||
|
||||
char *crash = NULL;
|
||||
(*crash) = 0;
|
||||
|
||||
ms_evtLoopPopup->Exit();
|
||||
}
|
||||
|
||||
|
@@ -653,7 +653,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
|
||||
if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
|
||||
{
|
||||
// This might actually be done in wxWindow::SetFocus()
|
||||
// and not here.
|
||||
// and not here. TODO.
|
||||
g_prevFocus = wxWindow::FindFocus();
|
||||
g_nextFocus = win;
|
||||
|
||||
@@ -661,9 +661,18 @@ void wxApp::ProcessXEvent(WXEvent* _event)
|
||||
}
|
||||
}
|
||||
|
||||
#if !wxUSE_NANOX
|
||||
if (event->type == LeaveNotify || event->type == EnterNotify)
|
||||
{
|
||||
// Throw out NotifyGrab and NotifyUngrab
|
||||
if (event->xcrossing.mode != NotifyNormal)
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
wxMouseEvent wxevent;
|
||||
wxTranslateMouseEvent(wxevent, win, window, event);
|
||||
win->GetEventHandler()->ProcessEvent( wxevent );
|
||||
|
||||
return;
|
||||
}
|
||||
case FocusIn:
|
||||
|
Reference in New Issue
Block a user