On 7/6/2011 4:01 PM, Consul wrote:
Some of the files in the FLTK3 examples directory did not compile for me (Windows XP host, MSys/MinGW gcc 4.5.0), this patch fixed the problem. No sanity checks have been performed, except execution of compiled exes, which appear to work ok, with one noticeable exception: tree-simple brings up a blank window.
Sorry, I did not even touch tree-simple until now. It compiled ok, just didn't run properly. This patch fixed the problem From c503e631e37971b55d884039a0461b88be8a89e2 Mon Sep 17 00:00:00 2001 From: Alex Ivanov <[email protected]> Date: Wed, 6 Jul 2011 16:15:34 -0700 Subject: [PATCH] fix tree-simple --- examples/tree-simple.cxx | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/tree-simple.cxx b/examples/tree-simple.cxx index 8faad7e..37480a8 100644 --- a/examples/tree-simple.cxx +++ b/examples/tree-simple.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// Simple Fl_Tree widget example. - erco 06/05/2010 +// Simple fltk3::Tree widget example. - erco 06/05/2010 // // Copyright 2010 Greg Ercolano. // Copyright 1998-2010 by Bill Spitzak and others. @@ -26,31 +26,31 @@ // http://www.fltk.org/str.php // #include <stdio.h> -#include <FL/Fl.H> -#include <FL/Fl_Double_Window.H> -#include <FL/Fl_Tree.H> +#include <fltk3/run.h> +#include <fltk3/DoubleWindow.h> +#include <fltk3/Tree.h> // Tree's callback // Invoked whenever an item's state changes. // -void TreeCallback(Fl_Widget *w, void *data) { - Fl_Tree *tree = (Fl_Tree*)w; - Fl_Tree_Item *item = (Fl_Tree_Item*)tree->callback_item(); +void TreeCallback(fltk3::Widget *w, void *data) { + fltk3::Tree *tree = (fltk3::Tree*)w; + fltk3::TreeItem *item = (fltk3::TreeItem*)tree->callback_item(); if ( ! item ) return; switch ( tree->callback_reason() ) { - case FL_TREE_REASON_SELECTED: { + case fltk3::TREE_REASON_SELECTED: { char pathname[256]; tree->item_pathname(pathname, sizeof(pathname), item); fprintf(stderr, "TreeCallback: Item selected='%s', Full pathname='%s'\n", item->label(), pathname); break; } - case FL_TREE_REASON_DESELECTED: + case fltk3::TREE_REASON_DESELECTED: // fprintf(stderr, "TreeCallback: Item '%s' deselected\n", item->label()); break; - case FL_TREE_REASON_OPENED: + case fltk3::TREE_REASON_OPENED: // fprintf(stderr, "TreeCallback: Item '%s' opened\n", item->label()); break; - case FL_TREE_REASON_CLOSED: + case fltk3::TREE_REASON_CLOSED: // fprintf(stderr, "TreeCallback: Item '%s' closed\n", item->label()); default: break; @@ -58,12 +58,12 @@ void TreeCallback(Fl_Widget *w, void *data) { } int main(int argc, char *argv[]) { - Fl::scheme("gtk+"); - Fl_Double_Window *win = new Fl_Double_Window(250, 400, "Simple Tree"); + fltk3::scheme("gtk+"); + fltk3::DoubleWindow *win = new fltk3::DoubleWindow(250, 400, "Simple Tree"); win->begin(); { // Create the tree - Fl_Tree *tree = new Fl_Tree(10, 10, win->w()-20, win->h()-20); + fltk3::Tree *tree = new fltk3::Tree(10, 10, win->w()-20, win->h()-20); tree->showroot(0); // don't show root of tree tree->callback(TreeCallback); // setup a callback for the tree @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { win->end(); win->resizable(win); win->show(argc, argv); - return(Fl::run()); + return(fltk3::run()); } // -- 1.7.4.msysgit.0
>From c503e631e37971b55d884039a0461b88be8a89e2 Mon Sep 17 00:00:00 2001 From: Alex Ivanov <[email protected]> Date: Wed, 6 Jul 2011 16:15:34 -0700 Subject: [PATCH] fix tree-simple --- examples/tree-simple.cxx | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/tree-simple.cxx b/examples/tree-simple.cxx index 8faad7e..37480a8 100644 --- a/examples/tree-simple.cxx +++ b/examples/tree-simple.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// Simple Fl_Tree widget example. - erco 06/05/2010 +// Simple fltk3::Tree widget example. - erco 06/05/2010 // // Copyright 2010 Greg Ercolano. // Copyright 1998-2010 by Bill Spitzak and others. @@ -26,31 +26,31 @@ // http://www.fltk.org/str.php // #include <stdio.h> -#include <FL/Fl.H> -#include <FL/Fl_Double_Window.H> -#include <FL/Fl_Tree.H> +#include <fltk3/run.h> +#include <fltk3/DoubleWindow.h> +#include <fltk3/Tree.h> // Tree's callback // Invoked whenever an item's state changes. // -void TreeCallback(Fl_Widget *w, void *data) { - Fl_Tree *tree = (Fl_Tree*)w; - Fl_Tree_Item *item = (Fl_Tree_Item*)tree->callback_item(); +void TreeCallback(fltk3::Widget *w, void *data) { + fltk3::Tree *tree = (fltk3::Tree*)w; + fltk3::TreeItem *item = (fltk3::TreeItem*)tree->callback_item(); if ( ! item ) return; switch ( tree->callback_reason() ) { - case FL_TREE_REASON_SELECTED: { + case fltk3::TREE_REASON_SELECTED: { char pathname[256]; tree->item_pathname(pathname, sizeof(pathname), item); fprintf(stderr, "TreeCallback: Item selected='%s', Full pathname='%s'\n", item->label(), pathname); break; } - case FL_TREE_REASON_DESELECTED: + case fltk3::TREE_REASON_DESELECTED: // fprintf(stderr, "TreeCallback: Item '%s' deselected\n", item->label()); break; - case FL_TREE_REASON_OPENED: + case fltk3::TREE_REASON_OPENED: // fprintf(stderr, "TreeCallback: Item '%s' opened\n", item->label()); break; - case FL_TREE_REASON_CLOSED: + case fltk3::TREE_REASON_CLOSED: // fprintf(stderr, "TreeCallback: Item '%s' closed\n", item->label()); default: break; @@ -58,12 +58,12 @@ void TreeCallback(Fl_Widget *w, void *data) { } int main(int argc, char *argv[]) { - Fl::scheme("gtk+"); - Fl_Double_Window *win = new Fl_Double_Window(250, 400, "Simple Tree"); + fltk3::scheme("gtk+"); + fltk3::DoubleWindow *win = new fltk3::DoubleWindow(250, 400, "Simple Tree"); win->begin(); { // Create the tree - Fl_Tree *tree = new Fl_Tree(10, 10, win->w()-20, win->h()-20); + fltk3::Tree *tree = new fltk3::Tree(10, 10, win->w()-20, win->h()-20); tree->showroot(0); // don't show root of tree tree->callback(TreeCallback); // setup a callback for the tree @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { win->end(); win->resizable(win); win->show(argc, argv); - return(Fl::run()); + return(fltk3::run()); } // -- 1.7.4.msysgit.0
_______________________________________________ fltk-dev mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-dev
