summaryrefslogtreecommitdiff
path: root/src/drivers/Cocoa
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-03-20 08:44:30 +0000
committerManolo Gouy <Manolo>2016-03-20 08:44:30 +0000
commit4baca53944c5193947203b5a96f95bfe8954a9cb (patch)
treed6c4b27aebd3c2a8bd6869a7a0ce7dde1fb6fccf /src/drivers/Cocoa
parent51030530f24c33c59db3084bc2b088d50b2c6627 (diff)
Continue implementation of class Fl_Window_Driver according to Albrecht's plan.
This removes a bunch of friend class Fl_XXX_Window_Driver; declarations from Fl_Window.H, and therefore allows to add a new window driver without modifying the platform-independent code. The Fl_PicoXXX_Window_Driver classes have been modified but not tested ==> test needed. File Fl_X11_Window_Driver.cxx contained this: // DO NOT call this if the window is not mapped! static int can_xdbe() { ... } The new code does call can_xdbe() before any window is mapped, and does work. Since can_xdbe() asks the X server whether it supports the Xdbe extension, I don't see why this should not work without a mapped window. This point should be clarified by the author of "DO NOT call this if the window is not mapped!". git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11388 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Cocoa')
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index 3bc3f1dea..127a84d6d 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -56,7 +56,7 @@ void Fl_Cocoa_Window_Driver::take_focus()
void Fl_Cocoa_Window_Driver::flush_double() {
- pWindow->Fl_Window::flush();
+ flush_single();
}
@@ -115,7 +115,7 @@ void Fl_Cocoa_Window_Driver::draw_end()
// corner. This code draws a little ribbed triangle for dragging.
CGContextRef gc = (CGContextRef)Fl_Surface_Device::surface()->driver()->gc();
if (fl_mac_os_version < 100700 && gc && !pWindow->parent() && pWindow->resizable() &&
- (!pWindow->size_range_set || pWindow->minh!=pWindow->maxh || pWindow->minw!=pWindow->maxw)) {
+ (!size_range_set() || minh() != maxh() || minw() != maxw())) {
int dx = Fl::box_dw(pWindow->box())-Fl::box_dx(pWindow->box());
int dy = Fl::box_dh(pWindow->box())-Fl::box_dy(pWindow->box());
if (dx<=0) dx = 1;