summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2010-07-10 09:44:45 +0000
committerMatthias Melcher <fltk@matthiasm.com>2010-07-10 09:44:45 +0000
commit32716d6b1e8a90cbe61b60994323029ec6abe85c (patch)
tree9c047f9cbf6a6581ef408dfabdab0aebde240a1b /FL
parent8306c3d0b31d4e60a9ba9c4d0ca4ed6a32226de1 (diff)
Updated the Fluid IDE support for the current source file structure. Changed the Fl_Tree rendering code around a bit to make the tree more like MSWindows on Windows and more like Apple on Apple machines. I hope you guys like it. I also moved the function to load Fl_Preferences into an Fl_Tree into the Fl_Tree class where it belongs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7672 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Input_.H2
-rw-r--r--FL/Fl_Preferences.H3
-rw-r--r--FL/Fl_Tree.H2
3 files changed, 4 insertions, 3 deletions
diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H
index e93dd4c13..24bb641d4 100644
--- a/FL/Fl_Input_.H
+++ b/FL/Fl_Input_.H
@@ -151,7 +151,7 @@ class FL_EXPORT Fl_Input_ : public Fl_Widget {
/** \internal Horizontal cursor position in pixels while movin up or down. */
static double up_down_pos;
- /** \internal Flag to remeber last cursor move. */
+ /** \internal Flag to remember last cursor move. */
static int was_up_down;
/* Convert a given text segment into the text that will be rendered on screen. */
diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H
index 5d48ceef9..49d66247e 100644
--- a/FL/Fl_Preferences.H
+++ b/FL/Fl_Preferences.H
@@ -156,7 +156,7 @@ public:
// char export( const char *filename, Type fileFormat );
// char import( const char *filename );
- char copyTo(class Fl_Tree*);
+ // char copyTo(class Fl_Tree*); // deprecated, use Fl_Tree::load(Fl_Preferences&)
/**
'Name' provides a simple method to create numerical or more complex
@@ -227,7 +227,6 @@ private:
public:
Node( const char *path );
~Node();
- char copyTo(class Fl_Tree*, class Fl_Tree_Item*);
// node methods
int write( FILE *f );
const char *name();
diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H
index c365d1ae8..be309c81f 100644
--- a/FL/Fl_Tree.H
+++ b/FL/Fl_Tree.H
@@ -688,6 +688,8 @@ public:
void selectmode(Fl_Tree_Select val) {
_prefs.selectmode(val);
}
+
+ void load(class Fl_Preferences&);
};
#endif /*FL_TREE_H*/