Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed recursion crash in event handling (STR #1873

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6033 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-02-20 18:17:34 +00:00
parent ab406a8e79
commit 3e9fc08353
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8
STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
STR #1862, STR #1867, STR #1874)
- Fixed recursion crash in event handling (STR #1873)
- Fixed missing return coe in 'fltk-config' (STR #1875)
- Fixed inconsistencies with CHANGED flags (STR #1719)
- Fixed message sent to hidden widgets (STR #1849)
src/Fl_mac.cxx
+11 -2
View File
@@ -850,7 +850,7 @@ static pascal OSStatus carbonWindowHandler( EventHandlerCallRef nextHandler, Eve
if ( !window->parent() ) Fl::handle( FL_HIDE, window);
break;
case kEventWindowActivated:
if ( window!=activeWindow )
if ( window->shown() && window!=activeWindow )
{
GetWindowClass( fl_xid( window ), &winClass );
if ( winClass != kHelpWindowClass ) { // help windows can't get the focus!
@@ -899,6 +899,11 @@ static pascal OSStatus carbonMousewheelHandler( EventHandlerCallRef nextHandler,
fl_os_event = event;
Fl_Window *window = (Fl_Window*)userData;
if ( !window->shown() )
{
fl_unlock_function();
return noErr;
}
Fl::first_window(window);
EventMouseWheelAxis axis;
@@ -954,6 +959,11 @@ static pascal OSStatus carbonMouseHandler( EventHandlerCallRef nextHandler, Even
fl_os_event = event;
Fl_Window *window = (Fl_Window*)userData;
if ( !window->shown() )
{
fl_unlock_function();
return noErr;
}
Fl::first_window(window);
Point pos;
GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &pos );
@@ -2459,4 +2469,3 @@ void MacUnmapWindow(Fl_Window *w, WindowPtr p) {
//
// End of "$Id$".
//