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

wxWindow::Enable now correctly has recursive effect (and maybe other fixes)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-14 22:20:24 +00:00
parent 3902989824
commit 0a89ac9c27
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mgl/window.cpp
View File

@@ -117,7 +117,6 @@ bool wxCreateMGL_WM()
#if wxUSE_SYSTEM_OPTIONS #if wxUSE_SYSTEM_OPTIONS
// FIXME_MGL -- so what is The Proper Way? // FIXME_MGL -- so what is The Proper Way?
width=800, height=600;
if ( wxSystemOptions::HasOption(wxT("mgl.screen-width") ) if ( wxSystemOptions::HasOption(wxT("mgl.screen-width") )
width = wxSystemOptions::GetOptionInt(wxT("mgl.screen-width")); width = wxSystemOptions::GetOptionInt(wxT("mgl.screen-width"));
if ( wxSystemOptions::HasOption(wxT("mgl.screen-height") ) if ( wxSystemOptions::HasOption(wxT("mgl.screen-height") )
@@ -199,7 +198,13 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
MGL_wmCoordGlobalToLocal(win->GetHandle(), MGL_wmCoordGlobalToLocal(win->GetHandle(),
e->where_x, e->where_y, &where.x, &where.y); e->where_x, e->where_y, &where.x, &where.y);
if ( !win->IsEnabled() ) return FALSE; for (wxWindowMGL *w = win; w; w = w->GetParent())
{
if ( !w->IsEnabled() )
return FALSE;
if ( w->IsTopLevel() )
break;
}
wxEventType type = wxEVT_NULL; wxEventType type = wxEVT_NULL;
wxMouseEvent event; wxMouseEvent event;