diff options
| author | Manolo Gouy <Manolo> | 2016-04-19 06:34:40 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-19 06:34:40 +0000 |
| commit | 366f4bfbc9e6d71e7b5fccf6d666d5dd3cab600c (patch) | |
| tree | 2773f44a324655a262a29e176b48965ee37611bc /src/Fl_cocoa.mm | |
| parent | c0f14ca2f00b1ea026298b0efa91c8b6afb13244 (diff) | |
Move the set_key_window() member function from class Fl_X to class Fl_Cocoa_Window_Driver.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11655 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 51d1efaaa..36cdba14d 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -1945,11 +1945,11 @@ static void handleUpdateEvent( Fl_Window *window ) } -int Fl_X::fake_X_wm(const Fl_Window* w,int &X,int &Y, int &bt,int &bx, int &by) { +static int fake_X_wm(Fl_Window* w,int &X,int &Y, int &bt,int &bx, int &by) { int W, H, xoff, yoff, dx, dy; int ret = bx = by = bt = 0; if (w->border() && !w->parent()) { - if (w->maxw != w->minw || w->maxh != w->minh) { + if (w->driver()->maxw() != w->driver()->minw() || w->driver()->maxh() != w->driver()->minh()) { ret = 2; } else { ret = 1; @@ -3823,9 +3823,9 @@ static void createAppleMenu(void) } -void Fl_X::set_key_window() +void Fl_Cocoa_Window_Driver::set_key_window() { - [xid makeKeyWindow]; + [fl_xid(pWindow) makeKeyWindow]; } static NSImage *imageFromText(const char *text, int *pwidth, int *pheight) |