Author: matt
Date: 2011-06-19 13:44:06 -0700 (Sun, 19 Jun 2011)
New Revision: 8826
Log:
123: fixed default callback issue
Modified:
branches/branch-3.0/FL/gl.h
branches/branch-3.0/src/Fl_Widget.cxx
Modified: branches/branch-3.0/FL/gl.h
===================================================================
--- branches/branch-3.0/FL/gl.h 2011-06-19 20:10:43 UTC (rev 8825)
+++ branches/branch-3.0/FL/gl.h 2011-06-19 20:44:06 UTC (rev 8826)
@@ -66,9 +66,7 @@
// void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, int
ld=0);
// inline void gl_color(int c);
-inline void gl_color(Fl_Color i) {
- gl_color(fltk3::_1to3_color(i));
-}
+// inline void gl_color(Fl_Color i) { gl_color(fltk3::_1to3_color(i)); }
inline void gl_draw(const char *s, int x, int y, int w, int h, Fl_Align a) {
gl_draw(s, x, y, w, h, fltk3::_1to3_align(a));
Modified: branches/branch-3.0/src/Fl_Widget.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Widget.cxx 2011-06-19 20:10:43 UTC (rev
8825)
+++ branches/branch-3.0/src/Fl_Widget.cxx 2011-06-19 20:44:06 UTC (rev
8826)
@@ -338,7 +338,7 @@
void
fltk3::Widget::do_callback(fltk3::Widget* o,void* arg) {
fltk3::WidgetTracker wp(this);
- if (o && o->pWrapper) {
+ if (o && o->pWrapper && o->callback_!=default_callback) {
callback_((fltk3::Widget*)o->pWrapper, arg);
} else {
callback_(o,arg);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
