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

Fixed first window behavior in OS X (STR #1548)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5656 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2007-02-02 16:10:19 +00:00
parent c005f9956f
commit 2368590ecd
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.8
- Documentation fixes (STR #1454, STR #1455, STR #1456, - Documentation fixes (STR #1454, STR #1455, STR #1456,
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578) STR #1457, STR #1458, STR #1460, STR #1481, STR #1578)
- Avoiding hidden mouse pointer in OS X (STR #1475) - Avoiding hidden mouse pointer in OS X (STR #1475)
- Fixed first window behavior in OS X (STR #1548)
- Fixed calculation of character widths for OS X - Fixed calculation of character widths for OS X
Quartz rendering (no STR) Quartz rendering (no STR)
- Fixed OS X mouse click handling (STR #1504) - Fixed OS X mouse click handling (STR #1504)
src/Fl_mac.cxx
+6
View File
@@ -802,6 +802,7 @@ static pascal OSStatus carbonWindowHandler( EventHandlerCallRef nextHandler, Eve
UInt32 kind = GetEventKind( event ); UInt32 kind = GetEventKind( event );
OSStatus ret = eventNotHandledErr; OSStatus ret = eventNotHandledErr;
Fl_Window *window = (Fl_Window*)userData; Fl_Window *window = (Fl_Window*)userData;
Fl::first_window(window);
Rect currentBounds, originalBounds; Rect currentBounds, originalBounds;
WindowClass winClass; WindowClass winClass;
@@ -898,6 +899,7 @@ static pascal OSStatus carbonMousewheelHandler( EventHandlerCallRef nextHandler,
fl_os_event = event; fl_os_event = event;
Fl_Window *window = (Fl_Window*)userData; Fl_Window *window = (Fl_Window*)userData;
Fl::first_window(window);
EventMouseWheelAxis axis; EventMouseWheelAxis axis;
GetEventParameter( event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(EventMouseWheelAxis), NULL, &axis ); GetEventParameter( event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(EventMouseWheelAxis), NULL, &axis );
@@ -952,6 +954,7 @@ static pascal OSStatus carbonMouseHandler( EventHandlerCallRef nextHandler, Even
fl_os_event = event; fl_os_event = event;
Fl_Window *window = (Fl_Window*)userData; Fl_Window *window = (Fl_Window*)userData;
Fl::first_window(window);
Point pos; Point pos;
GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &pos ); GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &pos );
EventMouseButton btn; EventMouseButton btn;
@@ -1074,6 +1077,7 @@ pascal OSStatus carbonKeyboardHandler(
static char buffer[5]; static char buffer[5];
int sendEvent = 0; int sendEvent = 0;
Fl_Window *window = (Fl_Window*)userData; Fl_Window *window = (Fl_Window*)userData;
Fl::first_window(window);
UInt32 mods; UInt32 mods;
static UInt32 prevMods = 0xffffffff; static UInt32 prevMods = 0xffffffff;
@@ -1678,6 +1682,7 @@ static OSErr fillCurrentDragData(DragReference dragRef)
static pascal OSErr dndTrackingHandler( DragTrackingMessage msg, WindowPtr w, void *userData, DragReference dragRef ) static pascal OSErr dndTrackingHandler( DragTrackingMessage msg, WindowPtr w, void *userData, DragReference dragRef )
{ {
Fl_Window *target = (Fl_Window*)userData; Fl_Window *target = (Fl_Window*)userData;
Fl::first_window(target);
Point mp; Point mp;
static int px, py; static int px, py;
@@ -1741,6 +1746,7 @@ static pascal OSErr dndReceiveHandler( WindowPtr w, void *userData, DragReferenc
OSErr ret; OSErr ret;
Fl_Window *target = fl_dnd_target_window = (Fl_Window*)userData; Fl_Window *target = fl_dnd_target_window = (Fl_Window*)userData;
Fl::first_window(target);
GetDragMouse( dragRef, &mp, 0 ); GetDragMouse( dragRef, &mp, 0 );
Fl::e_x_root = mp.h; Fl::e_x_root = mp.h;
Fl::e_y_root = mp.v; Fl::e_y_root = mp.v;