Author: fabien
Date: 2012-04-27 17:42:31 -0700 (Fri, 27 Apr 2012)
New Revision: 9406
Log:
Fixed build break on FLTK_ABI_VERSION >= 10302 introduce in r9293 as extern ref
to fl_copy_offscreen would not be found anymore by linker... This can't be
captured yet by the Jenkins continous intergration builds as the compilation is
for the FLTK_ABIVERSION >= 10302
Modified:
branches/branch-1.3/src/Fl_Double_Window.cxx
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_Double_Window.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Double_Window.cxx 2012-04-27 02:11:37 UTC
(rev 9405)
+++ branches/branch-1.3/src/Fl_Double_Window.cxx 2012-04-28 00:42:31 UTC
(rev 9406)
@@ -70,7 +70,7 @@
\param srcx,srcy origin in offscreen buffer of rectangle to copy
*/
#if FLTK_ABI_VERSION >= 10302
-inline void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap,
int srcx, int srcy) {
+void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int
srcx, int srcy) {
fl_graphics_driver->copy_offscreen(x, y, w, h, pixmap, srcx, srcy);
}
#else
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2012-04-27 02:11:37 UTC (rev 9405)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2012-04-28 00:42:31 UTC (rev 9406)
@@ -564,10 +564,28 @@
{
containsGLsubwindow = contains;
}
+
- (BOOL)canBecomeKeyWindow
{
+ if (Fl::modal_ && (Fl::modal_ != w))
+ return NO; // prevent the caption to be redrawn as active on click
+ // when another modal window is currently the key win
+
return !(w->tooltip_window() || w->menu_window());
}
+
+#if 0
+
+- (BOOL)canBecomeMainWindow
+{
+ if (Fl::modal_ && (Fl::modal_ != w))
+ return NO; // prevent the caption to be redrawn as active on click
+ // when another modal window is currently the key win
+
+ return !(w->tooltip_window() || w->menu_window());
+}
+#endif
+
@end
@interface FLApplication : NSObject
@@ -2107,6 +2125,9 @@
if ( w->border() || (!w->modal() && !w->tooltip_window()) ) {
Fl_Tooltip::enter(0);
}
+
+ if (w->modal()) Fl::modal_ = w;
+
w->set_visible();
if ( w->border() || (!w->modal() && !w->tooltip_window()) )
Fl::handle(FL_FOCUS, w);
Fl::first_window(w);
@@ -2129,7 +2150,7 @@
w->handle(Fl::e_number = FL_SHOW);
Fl::e_number = old_event;
- if (w->modal()) { Fl::modal_ = w; fl_fix_focus(); }
+ // if (w->modal()) { Fl::modal_ = w; fl_fix_focus(); }
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
