DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L2341
Version: 1.3-feature
Link: http://www.fltk.org/str.php?L2341
Version: 1.3-feature
diff -ur fltk-1.3.x-r7626-orig/src/Fl_Preferences.cxx
fltk-1.3.x-r7626/src/Fl_Preferences.cxx
--- fltk-1.3.x-r7626-orig/src/Fl_Preferences.cxx 2010-04-03
08:03:43.000000000 -0500
+++ fltk-1.3.x-r7626/src/Fl_Preferences.cxx 2010-06-10 00:22:47.202103465
-0500
@@ -28,7 +28,6 @@
#include <FL/Fl.H>
#include <FL/Fl_Preferences.H>
#include <FL/Fl_Plugin.H>
-#include <FL/Fl_Tree.H>
#include <FL/filename.H>
#include <stdio.h>
@@ -380,17 +379,6 @@
/**
- Copy the database hierarchy to an Fl_Tree browser from this node down.
- */
-char Fl_Preferences::copyTo(Fl_Tree *tree)
-{
- if (!tree->root())
- tree->add(name());
- return node->copyTo(tree, tree->root());
-}
-
-
-/**
Returns the number of groups that are contained within a group.
\return 0 for no groups at all
@@ -1762,28 +1750,6 @@
indexed_ = 0;
}
-char Fl_Preferences::Node::copyTo(Fl_Tree *tree, Fl_Tree_Item *ti)
-{
- ti->label(name());
- ti->user_data(this);
- Node *nd = child_;
- for ( ; nd; nd = nd->next_) {
- Fl_Tree_Item *tic = tree->insert(ti, 0, 0);
- nd->copyTo(tree, tic);
- tic->close();
- }
- int i, n = nEntry_;
- for (i=0; i<n; i++) {
- char buf[80];
- const char *name = entry_[i].name;
- const char *value = entry_[i].value;
- fl_snprintf(buf, 80, "%s: %s", name, value);
- tree->add(ti, buf);
- }
- return 0;
-}
-
-
/**
* \brief Create a plugin.
*
diff -ur fltk-1.3.x-r7626-orig/src/Fl_Tree.cxx fltk-1.3.x-r7626/src/Fl_Tree.cxx
--- fltk-1.3.x-r7626-orig/src/Fl_Tree.cxx 2010-05-11 23:59:52.000000000
-0500
+++ fltk-1.3.x-r7626/src/Fl_Tree.cxx 2010-06-10 00:24:47.840101303 -0500
@@ -7,6 +7,8 @@
#include <string.h>
#include <FL/Fl_Tree.H>
+#include <FL/Fl_Preferences.H>
+#include "flstring.h"
#define SCROLL_W 15
@@ -426,6 +428,37 @@
return(changed);
}
+/**
+ Copy the database hierarchy to an Fl_Tree browser from this node down.
+ */
+char Fl_Preferences::copyTo(Fl_Tree *tree)
+{
+ if (!tree->root())
+ tree->add(name());
+ return node->copyTo(tree, tree->root());
+}
+
+char Fl_Preferences::Node::copyTo(Fl_Tree *tree, Fl_Tree_Item *ti)
+{
+ ti->label(name());
+ ti->user_data(this);
+ Node *nd = child_;
+ for ( ; nd; nd = nd->next_) {
+ Fl_Tree_Item *tic = tree->insert(ti, 0, 0);
+ nd->copyTo(tree, tic);
+ tic->close();
+ }
+ int i, n = nEntry_;
+ for (i=0; i<n; i++) {
+ char buf[80];
+ const char *name = entry_[i].name;
+ const char *value = entry_[i].value;
+ fl_snprintf(buf, 80, "%s: %s", name, value);
+ tree->add(ti, buf);
+ }
+ return 0;
+}
+
//
// End of "$Id: Fl_Tree.cxx 7604 2010-05-12 04:59:52Z greg.ercolano $".
//
_______________________________________________
fltk-dev mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-dev
