[fltk.commit] [Library] r8247 - in branches/branch-3.0-2011: src test

[fltk-dev]

Author: matt
Date: 2011-01-10 13:43:40 -0800 (Mon, 10 Jan 2011)
New Revision: 8247
Log:
Fixed fltk3::Group virtual calls

Modified:
   branches/branch-3.0-2011/src/Fl_Group.cxx
   branches/branch-3.0-2011/test/button.cxx

Modified: branches/branch-3.0-2011/src/Fl_Group.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Group.cxx   2011-01-10 21:34:05 UTC (rev 
8246)
+++ branches/branch-3.0-2011/src/Fl_Group.cxx   2011-01-10 21:43:40 UTC (rev 
8247)
@@ -34,6 +34,7 @@
 #include <fltk3/run.h>
 #include <fltk3/Group.H>
 #include <fltk3/Window.h>
+#include <fltk3/Wrapper.h>
 #include <fltk3/fl_draw.H>
 #include <stdlib.h>
 
@@ -148,6 +149,7 @@
 }
 
 int fltk3::Group::handle(int event) {
+  FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle);
 
   fltk3::Widget*const* a = array();
   int i;
@@ -635,6 +637,7 @@
   \sa fltk3::Widget::resize(int,int,int,int)
 */
 void fltk3::Group::resize(int X, int Y, int W, int H) {
+  FLTK3_OBJECT_VCALLS_WRAPPER(resize(X, Y, W, H), Resize);
 
   int dx = X-x();
   int dy = Y-y();
@@ -739,6 +742,7 @@
 }
 
 void fltk3::Group::draw() {
+  FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw);
   if (damage() & ~fltk3::DAMAGE_CHILD) { // redraw the entire thing:
     draw_box();
     draw_label();

Modified: branches/branch-3.0-2011/test/button.cxx
===================================================================
--- branches/branch-3.0-2011/test/button.cxx    2011-01-10 21:34:05 UTC (rev 
8246)
+++ branches/branch-3.0-2011/test/button.cxx    2011-01-10 21:43:40 UTC (rev 
8247)
@@ -27,15 +27,17 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Button.H>
+#include <fltk3/run.h>
+#include <fltk3/Window.h>
+#include <fltk3/Button.h>
 
-void beepcb(Fl_Widget *, void *) {
+using namespace fltk3;
+
+void beepcb(Widget *, void *) {
   printf("\007"); fflush(stdout);
 }
 
-void exitcb(Fl_Widget *, void *) {
+void exitcb(Widget *, void *) {
   exit(0);
 }
 
@@ -49,18 +51,18 @@
 #endif
 
 int main(int argc, char ** argv) {
-  Fl_Window *window = new Fl_Window(320,65);
-  Fl_Button *b1 = new Fl_Button(20, 20, 80, 25, "&Beep");
+  Window *window = new Window(320,65);
+  Button *b1 = new Button(20, 20, 80, 25, "&Beep");
   b1->callback(beepcb,0);
-  /*Fl_Button *b2 =*/ new Fl_Button(120,20, 80, 25, "&no op");
-  Fl_Button *b3 = new Fl_Button(220,20, 80, 25, "E&xit");
+  /*Button *b2 =*/ new Button(120,20, 80, 25, "&no op");
+  Button *b3 = new Button(220,20, 80, 25, "E&xit");
   b3->callback(exitcb,0);
   window->end();
   window->show(argc,argv);
 #if 0
   Fl::add_fd(0, stdin_cb);
 #endif
-  return Fl::run();
+  return run();
 }
 
 //

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit