From e6631a0f7fdc8d3383927bac49f521791cddcc9c Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 12 Mar 2016 22:24:20 +0000 Subject: Moved the Fl_Window::decorated_*() functions teh Window_Driver git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11356 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_cocoa.mm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/Fl_cocoa.mm') diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 55b7f7d09..94ade1d9e 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -4289,20 +4289,22 @@ Window fl_xid(const Fl_Window* w) return temp ? temp->xid : 0; } -int Fl_Window::decorated_w() +int Fl_Cocoa_Window_Driver::decorated_w() { - if (!shown() || parent() || !border() || !visible()) return w(); + if (!pWindow->shown() || pWindow->parent() || !pWindow->border() || !pWindow->visible()) + return pWindow->w(); int bx, by, bt; get_window_frame_sizes(bx, by, bt); - return w() + 2 * bx; + return pWindow->w() + 2 * bx; } -int Fl_Window::decorated_h() +int Fl_Cocoa_Window_Driver::decorated_h() { - if (!shown() || parent() || !border() || !visible()) return h(); + if (!pWindow->shown() || pWindow->parent() || !pWindow->border() || !pWindow->visible()) + return pWindow->h(); int bx, by, bt; get_window_frame_sizes(bx, by, bt); - return h() + bt + by; + return pWindow->h() + bt + by; } // clip the graphics context to rounded corners -- cgit v1.2.3