Author: matt
Date: 2011-06-19 14:28:45 -0700 (Sun, 19 Jun 2011)
New Revision: 8827
Log:
123: implemented most of fl_ask
Modified:
branches/branch-3.0/FL/Fl_Help_View.H
branches/branch-3.0/FL/Fl_Hold_Browser.H
branches/branch-3.0/FL/Fl_Tree.H
branches/branch-3.0/FL/Fl_Tree_Item.H
branches/branch-3.0/FL/Fl_Tree_Item_Array.H
branches/branch-3.0/FL/Fl_Tree_Prefs.H
branches/branch-3.0/FL/fl_ask.H
branches/branch-3.0/fltk3/Tree.h
branches/branch-3.0/fltk3/ask.h
branches/branch-3.0/src/fl_ask.cxx
Modified: branches/branch-3.0/FL/Fl_Help_View.H
===================================================================
--- branches/branch-3.0/FL/Fl_Help_View.H 2011-06-19 20:44:06 UTC (rev
8826)
+++ branches/branch-3.0/FL/Fl_Help_View.H 2011-06-19 21:28:45 UTC (rev
8827)
@@ -146,7 +146,7 @@
}
void link(Fl_Help_Func *fn) {
- ((fltk3::HelpView*)_p)->link(fn);
+ ((fltk3::HelpView*)_p)->link((fltk3::HelpFunc*)fn);
}
int load(const char *f) {
@@ -168,7 +168,7 @@
}
void textfont(Fl_Font font) {
- ((fltk3::HelpView*)_p)->font( fltk3::_1to3_font(font) );
+ ((fltk3::HelpView*)_p)->textfont( fltk3::_1to3_font(font) );
}
Fl_Fontsize textsize() const {
@@ -176,7 +176,7 @@
}
void textsize(Fl_Fontsize size) {
- ((fltk3::HelpView*)_p)->textsize( fltk3::_1to3_fontsize(size); )
+ ((fltk3::HelpView*)_p)->textsize( fltk3::_1to3_fontsize(size) );
}
Fl_Color textcolor() const {
Modified: branches/branch-3.0/FL/Fl_Hold_Browser.H
===================================================================
--- branches/branch-3.0/FL/Fl_Hold_Browser.H 2011-06-19 20:44:06 UTC (rev
8826)
+++ branches/branch-3.0/FL/Fl_Hold_Browser.H 2011-06-19 21:28:45 UTC (rev
8827)
@@ -39,7 +39,7 @@
Fl_Hold_Browser() { /* empty */ }
Fl_Hold_Browser(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HoldBrowser(X, Y, W< H, l);
+ _p = new fltk3::HoldBrowser(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree.H 2011-06-19 20:44:06 UTC (rev 8826)
+++ branches/branch-3.0/FL/Fl_Tree.H 2011-06-19 21:28:45 UTC (rev 8827)
@@ -1,4 +1,3 @@
-#error header has not been ported to 3.0 yet
//
// "$Id$"
//
@@ -6,6 +5,7 @@
#ifndef FL_TREE_H
#define FL_TREE_H
+#include <fltk3/Tree.h>
#include <FL/Fl.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Scrollbar.H>
@@ -19,7 +19,7 @@
//////////////////////
//
// Fl_Tree -- This file is part of the Fl_Tree widget for FLTK
-// Copyright (C) 2009-2010 by Greg Ercolano.
+// Copyright (C) 2009-2011 by Greg Ercolano.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -36,225 +36,65 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
+// 123 Wrapper started
+// - TODO: 123 - many methods not yet wrapped!
+//
-///
-/// \file
-/// \brief This file contains the definitions of the Fl_Tree class
-///
-
-/// \class Fl_Tree
-///
-/// \brief Tree widget.
-///
-/// \image html tree-simple.png "Fl_Tree example program"
-/// \image latex tree-simple.png "Fl_Tree example program" width=4cm
-///
-/// \code
-/// Fl_Tree // Top level widget
-/// |--- Fl_Tree_Item // Items in the tree
-/// |--- Fl_Tree_Prefs // Preferences for the
tree
-/// |--- Fl_Tree_Connector (enum) // Connection modes
-/// |--- Fl_Tree_Select (enum) // Selection modes
-/// |--- Fl_Tree_Sort (enum) // Sort behavior
-/// \endcode
-///
-/// Similar to Fl_Browser, Fl_Tree is a browser of Fl_Tree_Item's, which
is arranged
-/// in a parented hierarchy, or 'tree'. Subtrees can be expanded or
closed. Items can be
-/// added, deleted, inserted, sorted and re-ordered.
-///
-/// The tree items may also contain other FLTK widgets, like buttons,
input fields,
-/// or even "custom" widgets.
-///
-/// The callback() is invoked depending on the value of when():
-///
-/// - FL_WHEN_RELEASE -- callback invoked when left mouse button is
released on an item
-/// - FL_WHEN_CHANGED -- callback invoked when left mouse changes
selection state
-///
-/// The simple way to define a tree:
-/// \code
-/// #include <FL/Fl_Tree.H>
-/// [..]
-/// Fl_Tree tree(X,Y,W,H);
-/// tree.begin();
-/// tree.add("Flintstones/Fred");
-/// tree.add("Flintstones/Wilma");
-/// tree.add("Flintstones/Pebbles");
-/// tree.add("Simpsons/Homer");
-/// tree.add("Simpsons/Marge");
-/// tree.add("Simpsons/Bart");
-/// tree.add("Simpsons/Lisa");
-/// tree.end();
-/// \endcode
-///
-/// Items can be added with add(),
-/// removed with remove(),
-/// completely cleared with clear(),
-/// inserted with insert() and insert_above(),
-/// selected/deselected with select() and deselect(),
-/// open/closed with open() and closed().
-/// Children of an item can be swapped around with
Fl_Tree_Item::swap_children(),
-/// sorting can be controlled when items are add()ed via sortorder().
-/// You can walk the entire tree with first() and next().
-/// You can walk selected items with first_selected_item() and
-/// next_selected_item().
-/// Items can be found by their pathname using find_item(const char*),
-/// and an item's pathname can be found with item_pathname().
-/// The selected items' colors are controlled by selection_color()
(inherited from Fl_Widget).
-///
-/// The tree can have different selection behaviors controlled by
selectmode().
-///
-/// FLTK widgets (including custom widgets) can be assigned to tree items
via
-/// Fl_Tree_Item::widget().
-///
-/// Icons for individual items can be changed with
-/// Fl_Tree_Item::openicon(),
-/// Fl_Tree_Item::closeicon(),
-/// Fl_Tree_Item::usericon().
-///
-/// Various default preferences can be globally manipulated via
Fl_Tree_Prefs,
-/// including colors, margins, icons, connection lines.
-///
-/// The tree's callback() will be invoked when items change state or are
open/closed.
-/// when() controls when mouse/keyboard events invoke the callback.
-/// callback_item() and callback_reason() can be used to determine the
cause of the callback. eg:
-///
-/// \code
-/// void MyTreeCallback(Fl_Widget *w, void *data) {
-/// Fl_Tree *tree = (Fl_Tree*)w;
-/// Fl_Tree_Item *item = (Fl_Tree_Item*)tree->callback_item(); // get
selected item
-/// switch ( tree->callback_reason() ) {
-/// case FL_TREE_REASON_SELECTED: [..]
-/// case FL_TREE_REASON_DESELECTED: [..]
-/// case FL_TREE_REASON_OPENED: [..]
-/// case FL_TREE_REASON_CLOSED: [..]
-/// }
-/// \endcode
-///
-/// To get the item's full menu pathname, you can use
Fl_Tree_Item::item_pathname(), eg:
-///
-/// \code
-/// char pathname[256] = "???";
-/// tree->item_pathname(pathname, sizeof(pathname), item); // eg.
"Parent/Child/Item"
-/// \endcode
-///
-/// To walk all the items of the tree from top to bottom:
-/// \code
-/// // Walk all the items in the tree, and print their labels
-/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) {
-/// printf("Item: %s\n", item->label());
-/// }
-/// \endcode
-///
-/// To recursively walk all the children of a particular item,
-/// define a function that uses recursion:
-/// \code
-/// // Find all of the item's children and print an indented report of their
labels
-/// void my_print_all_children(Fl_Tree_Item *item, int indent=0) {
-/// for ( int t=0; t<item->children(); t++ ) {
-/// printf("%*s Item: %s\n", indent, "", item->child(t)->label());
-/// my_print_all_children(item->child(t), indent+4); // recurse
-/// }
-/// }
-/// \endcode
-///
-/// To change the default label font and color for creating new items:
-/// \code
-/// tree = new Fl_Tree(..);
-/// tree->item_labelfont(FL_COURIER); // Use Courier font for all new items
-/// tree->item_labelfgcolor(FL_RED); // Use red color for labels of all new
items
-/// [..]
-/// // Now create the items in the tree using the above defaults.
-/// tree->add("Aaa");
-/// tree->add("Bbb");
-/// [..]
-/// \endcode
-///
-/// To change the font and color of all items in the tree:
-/// \code
-/// // Change the font and color of all items currently in the tree
-/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) {
-/// item->labelfont(FL_COURIER);
-/// item->labelcolor(FL_RED);
-/// }
-/// \endcode
-///
-/// The following image shows the tree's various visual elements
-/// and the methods that control them:
-///
-/// \image html tree-elements.png
-/// \image latex tree-elements.png "Fl_Tree dimensions" width=6cm
-///
-
-/// \enum Fl_Tree_Reason
-/// The reason the callback was invoked.
-///
enum Fl_Tree_Reason {
- FL_TREE_REASON_NONE=0, ///< unknown reason
- FL_TREE_REASON_SELECTED, ///< an item was selected
- FL_TREE_REASON_DESELECTED, ///< an item was de-selected
- FL_TREE_REASON_OPENED, ///< an item was opened
- FL_TREE_REASON_CLOSED ///< an item was closed
+ FL_TREE_REASON_NONE=0,
+ FL_TREE_REASON_SELECTED,
+ FL_TREE_REASON_DESELECTED,
+ FL_TREE_REASON_OPENED,
+ FL_TREE_REASON_CLOSED
};
class FL_EXPORT Fl_Tree : public Fl_Group {
- Fl_Tree_Item *_root; // can be null!
- Fl_Tree_Item *_item_focus; // item that has focus box
- Fl_Tree_Item *_callback_item; // item invoked during callback
(can be NULL)
- Fl_Tree_Reason _callback_reason; // reason for the callback
- Fl_Tree_Prefs _prefs; // all the tree's settings
- int _scrollbar_size; // size of scrollbar trough
protected:
- /// Vertical scrollbar
- Fl_Scrollbar *_vscroll;
+
+ // Fl_Scrollbar *_vscroll;
-protected:
- void item_clicked(Fl_Tree_Item* val);
- /// Do the callback for the item, setting the item and reason
- void do_callback_for_item(Fl_Tree_Item* item, Fl_Tree_Reason reason) {
- callback_reason(reason);
- callback_item(item);
- do_callback((Fl_Widget*)this, user_data());
+ void item_clicked(Fl_Tree_Item* val) {
+ ((fltk3::Tree*)_p)->item_clicked( (fltk3::TreeItem*)val );
}
- Fl_Tree_Item *next_visible_item(Fl_Tree_Item *start, int dir);
+ //void do_callback_for_item(Fl_Tree_Item* item, Fl_Tree_Reason reason) {
+
+ //Fl_Tree_Item *next_visible_item(Fl_Tree_Item *start, int dir);
+
public:
- Fl_Tree(int X, int Y, int W, int H, const char *L=0);
- ~Fl_Tree();
- int handle(int e);
- void draw();
- ///////////////////////
- // root methods
- ///////////////////////
+ Fl_Tree(int X, int Y, int W, int H, const char *L=0) {
+ _p = new fltk3::Widget(X, Y, W, H, L);
+ _p->wrapper(this);
+ }
- /// Set the label for the root item.
- ///
- /// Makes an internally managed copy of 'new_label'.
- ///
+ FLTK3_WRAPPER_VCALLS_OBJECT(Tree, draw(), draw(), Draw)
+
+ FLTK3_WRAPPER_VCALLS_OBJECT_INT(Tree, handle(int event), handle(event),
Handle)
+
+#if 0
void root_label(const char *new_label) {
if ( ! _root ) return;
_root->label(new_label);
}
- /// Returns the root item.
Fl_Tree_Item* root() {
return(_root);
}
+#endif
- ////////////////////////////////
- // Item creation/removal methods
- ////////////////////////////////
- Fl_Tree_Item *add(const char *path);
- Fl_Tree_Item* add(Fl_Tree_Item *item, const char *name);
+ Fl_Tree_Item *add(const char *path) {
+ return (Fl_Tree_Item*)((fltk3::Tree*)_p)->add(path);
+ }
+
+ Fl_Tree_Item* add(Fl_Tree_Item *item, const char *name) {
+ return (Fl_Tree_Item*)((fltk3::Tree*)_p)->add(item, name);
+ }
+
+#if 0
Fl_Tree_Item *insert_above(Fl_Tree_Item *above, const char *name);
Fl_Tree_Item* insert(Fl_Tree_Item *item, const char *name, int pos);
-
- /// Remove the specified \p item from the tree.
- /// \p item may not be NULL.
- /// If it has children, all those are removed too.
- /// \returns 0 if done, -1 if 'item' not found.
- ///
int remove(Fl_Tree_Item *item) {
if ( item == _root ) {
clear();
@@ -265,42 +105,21 @@
}
return(0);
}
- /// Clear all children from the tree.
- /// The tree will be left completely empty.
- ///
void clear() {
if ( ! _root ) return;
_root->clear_children();
delete _root; _root = 0;
}
- /// Clear all the children of a particular node in the tree specified by \p
item.
- /// Item may not be NULL.
- ///
void clear_children(Fl_Tree_Item *item) {
if ( item->has_children() ) {
item->clear_children();
redraw(); // redraw only if there were
children to clear
}
}
-
- ////////////////////////
- // Item lookup methods
- ////////////////////////
Fl_Tree_Item *find_item(const char *path);
const Fl_Tree_Item *find_item(const char *path) const;
int item_pathname(char *pathname, int pathnamelen, const Fl_Tree_Item *item)
const;
-
const Fl_Tree_Item *find_clicked() const;
-
- /// Return the item that was last clicked.
- ///
- /// Valid only from within the callback().
- ///
- /// Deprecated: use callback_item() instead.
- ///
- /// \returns the item clicked, or 0 if none.
- /// 0 may also be used to indicate several items were
clicked/changed.
- ///
Fl_Tree_Item *item_clicked() {
return(_callback_item);
}
@@ -310,30 +129,6 @@
Fl_Tree_Item *last();
Fl_Tree_Item *first_selected_item();
Fl_Tree_Item *next_selected_item(Fl_Tree_Item *item=0);
-
- //////////////////////////
- // Item open/close methods
- //////////////////////////
-
- /// Open the specified 'item'.
- /// This causes the item's children (if any) to be shown.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item to be opened. Must not be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - callback() is not invoked
- /// - 1 - callback() is invoked if item changed,
- /// callback_reason() will be FL_TREE_REASON_OPENED
- /// \returns
- /// - 1 -- item was opened
- /// - 0 -- item was already open, no change
- ///
- /// \see open(), close(), is_open(), is_close(), callback_item(),
callback_reason()
- ///
int open(Fl_Tree_Item *item, int docallback=1) {
if ( item->is_open() ) return(0);
item->open();
@@ -343,49 +138,11 @@
}
return(1);
}
- /// Opens the item specified by \p path (eg: "Parent/child/item").
- /// This causes the item's children (if any) to be shown.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. open("Holidays/12\\/25\//2010").
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - callback() is not invoked
- /// - 1 - callback() is invoked if item changed,
- /// callback_reason() will be FL_TREE_REASON_OPENED
- /// \returns
- /// - 1 -- OK: item opened
- /// - 0 -- OK: item was already open, no change
- /// - -1 -- ERROR: item was not found
- ///
- /// \see open(), close(), is_open(), is_close(), callback_item(),
callback_reason()
- ///
int open(const char *path, int docallback=1) {
Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(open(item, docallback));
}
- /// Toggle the open state of \p item.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item whose open state is to be toggled. Must not
be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - callback() is not invoked
- /// - 1 - callback() is invoked, callback_reason() will be either
- /// FL_TREE_REASON_OPENED or FL_TREE_REASON_CLOSED
- ///
- /// \see open(), close(), is_open(), is_close(), callback_item(),
callback_reason()
- ///
void open_toggle(Fl_Tree_Item *item, int docallback=1) {
if ( item->is_open() ) {
close(item, docallback);
@@ -393,24 +150,6 @@
open(item, docallback);
}
}
- /// Closes the specified \p item.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item to be closed. Must not be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - callback() is not invoked
- /// - 1 - callback() is invoked if item changed,
- /// callback_reason() will be FL_TREE_REASON_CLOSED
- /// \returns
- /// - 1 -- item was closed
- /// - 0 -- item was already closed, no change
- ///
- /// \see open(), close(), is_open(), is_close(), callback_item(),
callback_reason()
- ///
int close(Fl_Tree_Item *item, int docallback=1) {
if ( item->is_close() ) return(0);
item->close();
@@ -420,108 +159,27 @@
}
return(1);
}
- /// Closes the item specified by \p path, eg: "Parent/child/item".
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. close("Holidays/12\\/25\//2010").
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - callback() is not invoked
- /// - 1 - callback() is invoked if item changed,
- /// callback_reason() will be FL_TREE_REASON_CLOSED
- /// \returns
- /// - 1 -- OK: item closed
- /// - 0 -- OK: item was already closed, no change
- /// - -1 -- ERROR: item was not found
- ///
- /// \see open(), close(), is_open(), is_close(), callback_item(),
callback_reason()
- ///
int close(const char *path, int docallback=1) {
Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(close(item, docallback));
}
- /// See if \p item is open.
- ///
- /// Items that are 'open' are themselves not necessarily visible;
- /// one of the item's parents might be closed.
- ///
- /// \param[in] item -- the item to be tested. Must not be NULL.
- /// \returns
- /// - 1 : item is open
- /// - 0 : item is closed
- ///
int is_open(Fl_Tree_Item *item) const {
return(item->is_open()?1:0);
}
- /// See if item specified by \p path (eg: "Parent/child/item") is open.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. is_open("Holidays/12\\/25\//2010").
- ///
- /// Items that are 'open' are themselves not necessarily visible;
- /// one of the item's parents might be closed.
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \returns
- /// - 1 - OK: item is open
- /// - 0 - OK: item is closed
- /// - -1 - ERROR: item was not found
- ///
int is_open(const char *path) const {
const Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(item->is_open()?1:0);
}
- /// See if the specified \p item is closed.
- ///
- /// \param[in] item -- the item to be tested. Must not be NULL.
- /// \returns
- /// - 1 : item is open
- /// - 0 : item is closed
- ///
int is_close(Fl_Tree_Item *item) const {
return(item->is_close());
}
- /// See if item specified by \p path (eg: "Parent/child/item") is closed.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. is_close("Holidays/12\\/25\//2010").
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \returns
- /// - 1 - OK: item is closed
- /// - 0 - OK: item is open
- /// - -1 - ERROR: item was not found
- ///
int is_close(const char *path) const {
const Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(item->is_close()?1:0);
}
-
- /// Select the specified \p item. Use 'deselect()' to de-select it.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item to be selected. Must not be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - the callback() is not invoked
- /// - 1 - the callback() is invoked if item changed state,
- /// callback_reason() will be FL_TREE_REASON_SELECTED
- /// \returns
- /// - 1 - item's state was changed
- /// - 0 - item was already selected, no change was made
- ///
int select(Fl_Tree_Item *item, int docallback=1) {
if ( ! item->is_selected() ) {
item->select();
@@ -534,44 +192,11 @@
}
return(0);
}
- /// Select the item specified by \p path (eg: "Parent/child/item").
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. select("Holidays/12\\/25\//2010").
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - the callback() is not invoked
- /// - 1 - the callback() is invoked if item changed state,
- /// callback_reason() will be FL_TREE_REASON_SELECTED
- /// \returns
- /// - 1 : OK: item's state was changed
- /// - 0 : OK: item was already selected, no change was made
- /// - -1 : ERROR: item was not found
- ///
int select(const char *path, int docallback=1) {
Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(select(item, docallback));
}
- /// Toggle the select state of the specified \p item.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item to be selected. Must not be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - the callback() is not invoked
- /// - 1 - the callback() is invoked, callback_reason() will be
- /// either FL_TREE_REASON_SELECTED or FL_TREE_REASON_DESELECTED
- ///
void select_toggle(Fl_Tree_Item *item, int docallback=1) {
item->select_toggle();
set_changed();
@@ -581,22 +206,6 @@
}
redraw();
}
- /// De-select the specified \p item.
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] item -- the item to be selected. Must not be NULL.
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - the callback() is not invoked
- /// - 1 - the callback() is invoked if item changed state,
- /// callback_reason() will be FL_TREE_REASON_DESELECTED
- /// \returns
- /// - 0 - item was already deselected, no change was made
- /// - 1 - item's state was changed
- ///
int deselect(Fl_Tree_Item *item, int docallback=1) {
if ( item->is_selected() ) {
item->deselect();
@@ -609,296 +218,144 @@
}
return(0);
}
- /// Deselect an item specified by \p path (eg: "Parent/child/item").
- /// Handles redrawing if anything was actually changed.
- /// Invokes the callback depending on the value of optional parameter \p
docallback.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. deselect("Holidays/12\\/25\//2010").
- ///
- /// The callback can use callback_item() and callback_reason() respectively
to determine
- /// the item changed and the reason the callback was called.
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \param[in] docallback -- A flag that determines if the callback() is
invoked or not:
- /// - 0 - the callback() is not invoked
- /// - 1 - the callback() is invoked if item changed state,
- /// callback_reason() will be FL_TREE_REASON_DESELECTED
- /// \returns
- /// - 1 - OK: item's state was changed
- /// - 0 - OK: item was already deselected, no change was made
- /// - -1 - ERROR: item was not found
- ///
int deselect(const char *path, int docallback=1) {
Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(deselect(item, docallback));
}
-
int deselect_all(Fl_Tree_Item *item=0, int docallback=1);
int select_only(Fl_Tree_Item *selitem, int docallback=1);
int select_all(Fl_Tree_Item *item=0, int docallback=1);
void set_item_focus(Fl_Tree_Item *o);
-
- /// See if the specified \p item is selected.
- ///
- /// \param[in] item -- the item to be tested. Must not be NULL.
- ///
- /// \return
- /// - 1 : item selected
- /// - 0 : item deselected
- ///
int is_selected(Fl_Tree_Item *item) const {
return(item->is_selected()?1:0);
}
- /// See if item specified by \p path (eg: "Parent/child/item") is selected.
- ///
- /// Items or submenus that themselves contain slashes ('/' or '\')
- /// should be escaped, e.g. is_selected("Holidays/12\\/25\//2010").
- ///
- /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred")
- /// \returns
- /// - 1 : item selected
- /// - 0 : item deselected
- /// - -1 : item was not found
- ///
int is_selected(const char *path) {
Fl_Tree_Item *item = find_item(path);
if ( ! item ) return(-1);
return(is_selected(item));
}
- /// Print the tree as 'ascii art' to stdout.
- /// Used mainly for debugging.
- ///
void show_self() {
if ( ! _root ) return;
_root->show_self();
}
-
- /////////////////////////////////
- // Item attribute related methods
- /////////////////////////////////
-
- /// Get the default label fontsize used for creating new items.
Fl_Fontsize item_labelsize() const {
return(_prefs.labelsize());
}
- /// Set the default label font size used for creating new items.
- /// To change the font size on a per-item basis, use
Fl_Tree_Item::labelsize(Fl_Fontsize)
- ///
void item_labelsize(Fl_Fontsize val) {
_prefs.labelsize(val);
}
- /// Get the default font face used for creating new items.
Fl_Font item_labelfont() const {
return(_prefs.labelfont());
}
- /// Set the default font face used for creating new items.
- /// To change the font face on a per-item basis, use
Fl_Tree_Item::labelfont(Fl_Font)
- ///
void item_labelfont(Fl_Font val) {
_prefs.labelfont(val);
}
- /// Get the default label foreground color used for creating new items.
Fl_Color item_labelfgcolor(void) const {
return(_prefs.labelfgcolor());
}
- /// Set the default label foreground color used for creating new items.
- /// To change the foreground color on a per-item basis, use
Fl_Tree_Item::labelfgcolor(Fl_Color)
- ///
void item_labelfgcolor(Fl_Color val) {
_prefs.labelfgcolor(val);
}
- /// Get the default label background color used for creating new items.
Fl_Color item_labelbgcolor(void) const {
return(_prefs.labelbgcolor());
}
- /// Set the default label background color used for creating new items.
- /// To change the background color on a per-item basis, use
Fl_Tree_Item::labelbgcolor(Fl_Color)
- ///
void item_labelbgcolor(Fl_Color val) {
_prefs.labelbgcolor(val);
}
- /// Get the connector color used for tree connection lines.
Fl_Color connectorcolor() const {
return(_prefs.connectorcolor());
}
- /// Set the connector color used for tree connection lines.
void connectorcolor(Fl_Color val) {
_prefs.connectorcolor(val);
}
- /// Get the amount of white space (in pixels) that should appear
- /// between the widget's left border and the tree's contents.
- ///
int marginleft() const {
return(_prefs.marginleft());
}
- /// Set the amount of white space (in pixels) that should appear
- /// between the widget's left border and the left side of the tree's
contents.
- ///
void marginleft(int val) {
_prefs.marginleft(val);
redraw();
}
- /// Get the amount of white space (in pixels) that should appear
- /// between the widget's top border and the top of the tree's contents.
- ///
int margintop() const {
return(_prefs.margintop());
}
- /// Sets the amount of white space (in pixels) that should appear
- /// between the widget's top border and the top of the tree's contents.
- ///
void margintop(int val) {
_prefs.margintop(val);
redraw();
}
- /// Get the amount of white space (in pixels) that should appear
- /// below an open child tree's contents.
- ///
int openchild_marginbottom() const {
return(_prefs.openchild_marginbottom());
}
- /// Set the amount of white space (in pixels) that should appear
- /// below an open child tree's contents.
- ///
void openchild_marginbottom(int val) {
_prefs.openchild_marginbottom(val);
redraw();
}
- /// Gets the width of the horizontal connection lines (in pixels)
- /// that appear to the left of each tree item's label.
- ///
int connectorwidth() const {
return(_prefs.connectorwidth());
}
- /// Sets the width of the horizontal connection lines (in pixels)
- /// that appear to the left of each tree item's label.
- ///
void connectorwidth(int val) {
_prefs.connectorwidth(val);
redraw();
}
- /// Returns the Fl_Image being used as the default user icon for all
- /// newly created items.
- /// Returns zero if no icon has been set, which is the default.
- ///
Fl_Image *usericon() const {
return(_prefs.usericon());
}
- /// Sets the Fl_Image to be used as the default user icon for all
- /// newly created items.
- ///
- /// If you want to specify user icons on a per-item basis,
- /// use Fl_Tree_Item::usericon() instead.
- ///
- /// \param[in] val -- The new image to be used, or
- /// zero to disable user icons.
- ///
void usericon(Fl_Image *val) {
_prefs.usericon(val);
redraw();
}
- /// Returns the icon to be used as the 'open' icon.
- /// If none was set, the internal default is returned,
- /// a simple '[+]' icon.
- ///
Fl_Image *openicon() const {
return(_prefs.openicon());
}
- /// Sets the icon to be used as the 'open' icon.
- /// This overrides the built in default '[+]' icon.
- ///
- /// \param[in] val -- The new image, or zero to use the default [+] icon.
- ///
void openicon(Fl_Image *val) {
_prefs.openicon(val);
redraw();
}
- /// Returns the icon to be used as the 'close' icon.
- /// If none was set, the internal default is returned,
- /// a simple '[-]' icon.
- ///
Fl_Image *closeicon() const {
return(_prefs.closeicon());
}
- /// Sets the icon to be used as the 'close' icon.
- /// This overrides the built in default '[-]' icon.
- ///
- /// \param[in] val -- The new image, or zero to use the default [-] icon.
- ///
void closeicon(Fl_Image *val) {
_prefs.closeicon(val);
redraw();
}
- /// Returns 1 if the collapse icon is enabled, 0 if not.
int showcollapse() const {
return(_prefs.showcollapse());
}
- /// Set if we should show the collapse icon or not.
- /// If collapse icons are disabled, the user will not be able
- /// to interactively collapse items in the tree, unless the application
- /// provides some other means via open() and close().
- ///
- /// \param[in] val 1: shows collapse icons (default),\n
- /// 0: hides collapse icons.
- ///
void showcollapse(int val) {
_prefs.showcollapse(val);
redraw();
}
- /// Returns 1 if the root item is to be shown, or 0 if not.
int showroot() const {
return(_prefs.showroot());
}
- /// Set if the root item should be shown or not.
- /// \param[in] val 1 -- show the root item (default)\n
- /// 0 -- hide the root item.
- ///
void showroot(int val) {
_prefs.showroot(val);
redraw();
}
- /// Returns the line drawing style for inter-connecting items.
Fl_Tree_Connector connectorstyle() const {
return(_prefs.connectorstyle());
}
- /// Sets the line drawing style for inter-connecting items.
void connectorstyle(Fl_Tree_Connector val) {
_prefs.connectorstyle(val);
redraw();
}
- /// Set the default sort order used when items are added to the tree.
- /// See Fl_Tree_Sort for possible values.
- ///
Fl_Tree_Sort sortorder() const {
return(_prefs.sortorder());
}
- /// Gets the sort order used to add items to the tree.
void sortorder(Fl_Tree_Sort val) {
_prefs.sortorder(val);
// no redraw().. only affects new add()itions
}
- /// Sets the style of box used to draw selected items.
- /// This is an fltk Fl_Boxtype.
- /// The default is influenced by FLTK's current Fl::scheme()
- ///
Fl_Boxtype selectbox() const {
return(_prefs.selectbox());
}
- /// Gets the style of box used to draw selected items.
- /// This is an fltk Fl_Boxtype.
- /// The default is influenced by FLTK's current Fl::scheme()
- ///
void selectbox(Fl_Boxtype val) {
_prefs.selectbox(val);
redraw();
}
- /// Gets the tree's current selection mode.
Fl_Tree_Select selectmode() const {
return(_prefs.selectmode());
}
- /// Sets the tree's selection mode.
void selectmode(Fl_Tree_Select val) {
_prefs.selectmode(val);
}
@@ -911,103 +368,35 @@
void display(Fl_Tree_Item *item);
int vposition() const;
void vposition(int ypos);
-
- /// See if widget \p w is one of the Fl_Tree widget's scrollbars.
- /// Use this to skip over the scrollbars when walking the child() array.
Example:
- /// \code
- /// for ( int i=0; i<tree->children(); i++ ) { // walk children
- /// Fl_Widget *w= tree->child(i);
- /// if ( brow->is_scrollbar(w) ) continue; // skip scrollbars
- /// ..do work here..
- /// }
- /// \endcode
- /// \param[in] w Widget to test
- /// \returns 1 if \p w is a scrollbar, 0 if not.
- ///
int is_scrollbar(Fl_Widget *w) {
return( ( w == _vscroll ) ? 1 : 0 );
}
- /// Gets the current size of the scrollbars' troughs, in pixels.
- ///
- /// If this value is zero (default), this widget will use the global
- /// Fl::scrollbar_size() value as the scrollbar's width.
- ///
- /// \returns Scrollbar size in pixels, or 0 if the global Fl::scrollsize()
is being used.
- /// \see Fl::scrollbar_size(int)
- ///
+#endif
+
int scrollbar_size() const {
- return(_scrollbar_size);
+ return ((fltk3::Tree*)_p)->scrollbar_size();
}
- /// Sets the pixel size of the scrollbars' troughs to the \p size, in pixels.
- ///
- /// Normally you should not need this method, and should use the global
- /// Fl::scrollbar_size(int) instead to manage the size of ALL
- /// your widgets' scrollbars. This ensures your application
- /// has a consistent UI, is the default behavior, and is normally
- /// what you want.
- ///
- /// Only use THIS method if you really need to override the global
- /// scrollbar size. The need for this should be rare.
- ///
- /// Setting \p size to the special value of 0 causes the widget to
- /// track the global Fl::scrollbar_size(), which is the default.
- ///
- /// \param[in] size Sets the scrollbar size in pixels.\n
- /// If 0 (default), scrollbar size tracks the global
Fl::scrollbar_size()
- /// \see Fl::scrollbar_size()
- ///
+
void scrollbar_size(int size) {
- _scrollbar_size = size;
- int scrollsize = _scrollbar_size ? _scrollbar_size :
Fl::scrollbar_size();
- if ( _vscroll->w() != scrollsize ) {
- _vscroll->resize(x()+w()-scrollsize, h(), scrollsize, _vscroll->h());
- }
+ ((fltk3::Tree*)_p)->scrollbar_size(size);
}
-
- ///////////////////////
- // callback related
- ///////////////////////
-
- /// Sets the item that was changed for this callback.
- /// Used internally to pass the item that invoked the callback.
- ///
+
+#if 0
void callback_item(Fl_Tree_Item* item) {
_callback_item = item;
}
- /// Gets the item that caused the callback.
- /// The callback() can use this value to see which item changed.
- ///
Fl_Tree_Item* callback_item() {
return(_callback_item);
}
- /// Sets the reason for this callback.
- /// Used internally to pass the reason the callback was invoked.
- ///
void callback_reason(Fl_Tree_Reason reason) {
_callback_reason = reason;
}
- /// Gets the reason for this callback.
- ///
- /// The callback() can use this value to see why it was called. Example:
- /// \code
- /// void MyTreeCallback(Fl_Widget *w, void *userdata) {
- /// Fl_Tree *tree = (Fl_Tree*)w;
- /// Fl_Tree_Item *item = tree->callback_item(); // the item
changed (can be NULL if more than one item was changed!)
- /// switch ( tree->callback_reason() ) { // reason
callback was invoked
- /// case FL_TREE_REASON_OPENED: ..item was opened..
- /// case FL_TREE_REASON_CLOSED: ..item was closed..
- /// case FL_TREE_REASON_SELECTED: ..item was selected..
- /// case FL_TREE_REASON_DESELECTED: ..item was deselected..
- /// }
- /// }
- /// \endcode
- ///
Fl_Tree_Reason callback_reason() const {
return(_callback_reason);
}
-
- /// Load FLTK preferences
void load(class Fl_Preferences&);
+#endif
+
};
#endif /*FL_TREE_H*/
Modified: branches/branch-3.0/FL/Fl_Tree_Item.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree_Item.H 2011-06-19 20:44:06 UTC (rev
8826)
+++ branches/branch-3.0/FL/Fl_Tree_Item.H 2011-06-19 21:28:45 UTC (rev
8827)
@@ -1,4 +1,3 @@
-#error header has not been ported to 3.0 yet
//
// "$Id$"
//
@@ -6,6 +5,7 @@
#ifndef FL_TREE_ITEM_H
#define FL_TREE_ITEM_H
+#include <fltk3/TreeItem.h>
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Image.H>
@@ -36,52 +36,29 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
+// 123 Wrapper started
+// - TODO: 123 - many methods not yet wrapped!
+//
-///
-/// \file
-/// \brief This file contains the definitions for Fl_Tree_Item
-///
-/// \brief Tree item
-///
-/// This class is a single tree item, and manages all of the item's attributes.
-/// Fl_Tree_Item is used by Fl_Tree, which is comprised of many instances of
Fl_Tree_Item.
-///
-/// Fl_Tree_Item is hierarchical; it dynamically manages an Fl_Tree_Item_Array
of children
-/// that are themselves instances of Fl_Tree_Item. Each item can have zero or
more children.
-/// When an item has children, close() and open() can be used to hide or show
them.
-///
-/// Items have their own attributes; font size, face, color.
-/// Items maintain their own hierarchy of children.
-///
-/// When you make changes to items, you'll need to tell the tree to redraw()
-/// for the changes to show up.
-///
-class FL_EXPORT Fl_Tree_Item {
- const char *_label; // label (memory managed)
- Fl_Font _labelfont; // label's font face
- Fl_Fontsize _labelsize; // label's font size
- Fl_Color _labelfgcolor; // label's fg color
- Fl_Color _labelbgcolor; // label's bg color
- char _open; // item is open?
- char _visible; // item is visible?
- char _active; // item activated?
- char _selected; // item selected?
- int _xywh[4]; // xywh of this widget (if
visible)
- int _collapse_xywh[4]; // xywh of collapse icon (if
any)
- int _label_xywh[4]; // xywh of label
- Fl_Widget *_widget; // item's label widget
(optional)
- Fl_Image *_usericon; // item's user-specific icon
(optional)
- Fl_Tree_Item_Array _children; // array of child items
- Fl_Tree_Item *_parent; // parent item (=0 if root)
- void *_userdata; // user data that can be
associated with an item
+class FL_EXPORT Fl_Tree_Item : public fltk3::TreeItem {
+
protected:
- void show_widgets();
- void hide_widgets();
- void draw_vertical_connector(int x, int y1, int y2, const Fl_Tree_Prefs
&prefs);
- void draw_horizontal_connector(int x1, int x2, int y, const Fl_Tree_Prefs
&prefs);
+
+ //void show_widgets();
+ //void hide_widgets();
+ //void draw_vertical_connector(int x, int y1, int y2, const Fl_Tree_Prefs
&prefs);
+ //void draw_horizontal_connector(int x1, int x2, int y, const Fl_Tree_Prefs
&prefs);
+
public:
- Fl_Tree_Item(const Fl_Tree_Prefs &prefs); // CTOR
+
+ Fl_Tree_Item(const Fl_Tree_Prefs &prefs)
+ : fltk3::TreeItem(prefs)
+ {
+ }
+
+#if 0
+
~Fl_Tree_Item(); // DTOR
Fl_Tree_Item(const Fl_Tree_Item *o); // COPY CTOR
int x() const { return(_xywh[0]); }
@@ -329,6 +306,8 @@
int is_root() const {
return(_parent==0?1:0);
}
+#endif
+
};
#endif /*FL_TREE_ITEM_H*/
Modified: branches/branch-3.0/FL/Fl_Tree_Item_Array.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree_Item_Array.H 2011-06-19 20:44:06 UTC (rev
8826)
+++ branches/branch-3.0/FL/Fl_Tree_Item_Array.H 2011-06-19 21:28:45 UTC (rev
8827)
@@ -1,4 +1,3 @@
-#error header has not been ported to 3.0 yet
//
// "$Id$"
//
@@ -6,6 +5,7 @@
#ifndef _FL_TREE_ITEM_ARRAY_H
#define _FL_TREE_ITEM_ARRAY_H
+#include <fltk3/TreeItemArray.h>
#include "Fl_Export.H"
class FL_EXPORT Fl_Tree_Item; // forward decl must *precede* first doxygen
comment block
@@ -33,30 +33,19 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
+// 123 Wrapper started
+// - TODO: 123 - many methods not yet wrapped!
+//
-///
-/// \file
-/// \brief This file defines a class that manages an array of Fl_Tree_Item
pointers.
-///
+class FL_EXPORT Fl_Tree_Item_Array : public fltk3::TreeItemArray {
-/// \brief Manages an array of Fl_Tree_Item pointers.
-///
-/// Because FLTK 1.x.x. has mandated that templates and STL not be used,
-/// we use this class to dynamically manage the arrays.
-///
-/// None of the methods do range checking on index values; the caller
-/// must be sure that index values are within the range 0<index<total()
-/// (unless otherwise noted).
-///
-
-class FL_EXPORT Fl_Tree_Item_Array {
- Fl_Tree_Item **_items; // items array
- int _total; // #items in array
- int _size; // #items *allocated* for array
- int _chunksize; // #items to enlarge mem allocation
- void enlarge(int count);
public:
- Fl_Tree_Item_Array(int new_chunksize = 10); // CTOR
+ Fl_Tree_Item_Array(int new_chunksize = 10)
+ : fltk3::TreeItemArray(new_chunksize)
+ {
+ }
+
+#if 0
~Fl_Tree_Item_Array(); // DTOR
Fl_Tree_Item_Array(const Fl_Tree_Item_Array *o); // COPY CTOR
/// Return the item and index \p i.
@@ -82,6 +71,8 @@
void insert(int pos, Fl_Tree_Item *new_item);
void remove(int index);
int remove(Fl_Tree_Item *item);
+#endif
+
};
#endif /*_FL_TREE_ITEM_ARRAY_H*/
Modified: branches/branch-3.0/FL/Fl_Tree_Prefs.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree_Prefs.H 2011-06-19 20:44:06 UTC (rev
8826)
+++ branches/branch-3.0/FL/Fl_Tree_Prefs.H 2011-06-19 21:28:45 UTC (rev
8827)
@@ -1,4 +1,3 @@
-#error header has not been ported to 3.0 yet
//
// "$Id$"
//
@@ -28,46 +27,22 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
+// 123 Wrapper started
+// - TODO: 123 - many methods not yet wrapped!
+//
-///
-/// \file
-/// \brief This file contains the definitions for Fl_Tree's preferences.
-///
-/// \code
-/// Fl_Tree_Prefs
-/// :
-/// .....:.......
-/// : :
-/// Fl_Tree :
-/// |_____ Fl_Tree_Item
-///
-/// \endcode
-///
-
-/// \class Fl_Tree_Prefs
-/// \brief Tree widget's preferences.
-
-/// \enum Fl_Tree_Sort
-/// Sort order options for items added to the tree
-///
enum Fl_Tree_Sort {
FL_TREE_SORT_NONE=0, ///< No sorting; items are added in the order defined
(default).
FL_TREE_SORT_ASCENDING=1, ///< Add items in ascending sort order.
FL_TREE_SORT_DESCENDING=2 ///< Add items in descending sort order.
};
-/// \enum Fl_Tree_Connector
-/// Defines the style of connection lines between items.
-///
enum Fl_Tree_Connector {
FL_TREE_CONNECTOR_NONE=0, ///< Use no lines connecting items
FL_TREE_CONNECTOR_DOTTED=1, ///< Use dotted lines connecting items (default)
FL_TREE_CONNECTOR_SOLID=2 ///< Use solid lines connecting items
};
-/// \enum Fl_Tree_Select
-/// Tree selection style.
-///
enum Fl_Tree_Select {
FL_TREE_SELECT_NONE=0, ///< Nothing selected when items are clicked
FL_TREE_SELECT_SINGLE=1, ///< Single item selected when item is clicked
(default)
@@ -75,42 +50,16 @@
///< SHIFT or CTRL or mouse drags.
};
-/// \class Fl_Tree_Prefs
-///
-/// \brief Fl_Tree's Preferences class.
-///
-/// This class manages the Fl_Tree's defaults.
-/// You should probably be using the methods in Fl_Tree
-/// instead of trying to accessing tree's preferences settings directly.
-///
-class FL_EXPORT Fl_Tree_Prefs {
- Fl_Font _labelfont; // label's font face
- Fl_Fontsize _labelsize; // label's font size
- int _margintop; // --
- int _marginleft; // |- tree's margins
- //int _marginright; // |
- //int _marginbottom; // --
- int _openchild_marginbottom; // extra space below an open child tree
- int _usericonmarginleft; // space to left of user icon (if any)
- int _labelmarginleft; // space to left of label
- int _connectorwidth; // connector width (right of open/close
icon)
- int _linespacing; // vertical space between lines
- // Colors
- Fl_Color _labelfgcolor; // label's foreground color
- Fl_Color _labelbgcolor; // background color
- Fl_Color _connectorcolor; // connector dotted line color
- Fl_Tree_Connector _connectorstyle; // connector line style
- Fl_Image *_openimage; // the 'open' icon [+]
- Fl_Image *_closeimage; // the 'close' icon [-]
- Fl_Image *_userimage; // user's own icon
- char _showcollapse; // 1=show collapse icons, 0=don't
- char _showroot; // show the root item as part of the
tree
- Fl_Tree_Sort _sortorder; // none, ascening, descending, etc.
- Fl_Boxtype _selectbox; // selection box type
- Fl_Tree_Select _selectmode; // selection mode
+class FL_EXPORT Fl_Tree_Prefs : public fltk3::TreePrefs {
+
public:
- Fl_Tree_Prefs();
+ Fl_Tree_Prefs()
+ : fltk3::TreePrefs()
+ {
+ }
+#if 0
+
////////////////////////////
// Labels
////////////////////////////
@@ -335,6 +284,8 @@
inline void selectmode(Fl_Tree_Select val) {
_selectmode = val;
}
+#endif
+
};
#endif /*FL_TREE_PREFS_H*/
Modified: branches/branch-3.0/FL/fl_ask.H
===================================================================
--- branches/branch-3.0/FL/fl_ask.H 2011-06-19 20:44:06 UTC (rev 8826)
+++ branches/branch-3.0/FL/fl_ask.H 2011-06-19 21:28:45 UTC (rev 8827)
@@ -62,24 +62,63 @@
va_end(ap);
}
-// FIXME: 123- inline int fl_ask(const char *,...) __fl_attr((__format__
(__printf__, 1, 2), __deprecated__));
-// FIXME: 123- inline int fl_choice(const char *q,const char *b0,const char
*b1,const char *b2,...) __fl_attr((__format__ (__printf__, 1, 5)));
-// FIXME: 123- inline const char *fl_input(const char *label, const char
*deflt = 0, ...) __fl_attr((__format__ (__printf__, 1, 3)));
-// FIXME: 123- inline const char *fl_password(const char *label, const char
*deflt = 0, ...) __fl_attr((__format__ (__printf__, 1, 3)));
+inline int fl_ask(const char *fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ int ret = fltk3::ask(ap, fmt);
+ va_end(ap);
+ return ret;
+}
+inline int fl_choice(const char *q,const char *b0,const char *b1,const char
*b2, ...) {
+ va_list ap;
+ va_start(ap, b2);
+ int ret = fltk3::choice(ap, q, b0, b1, b2);
+ va_end(ap);
+ return ret;
+}
+
+inline const char *fl_input(const char *label, const char *deflt = 0, ...) {
+ va_list ap;
+ va_start(ap, deflt);
+ const char *ret = fltk3::input(ap, label, deflt);
+ va_end(ap);
+ return ret;
+}
+
+inline const char *fl_password(const char *label, const char *deflt = 0, ...) {
+ va_list ap;
+ va_start(ap, deflt);
+ const char *ret = fltk3::password(ap, label, deflt);
+ va_end(ap);
+ return ret;
+}
+
#if 0 // FIXME: 123
inline Fl_Widget *fl_message_icon();
extern inline Fl_Font fl_message_font_;
extern inline Fl_Fontsize fl_message_size_;
inline void fl_message_font(Fl_Font f, Fl_Fontsize s) {
fl_message_font_ = f; fl_message_size_ = s;}
+#endif
-inline void fl_message_hotspot(int enable);
-inline int fl_message_hotspot(void);
+inline void fl_message_hotspot(int enable) {
+ fltk3::message_hotspot(enable);
+}
-inline void fl_message_title(const char *title);
-inline void fl_message_title_default(const char *title);
+inline int fl_message_hotspot(void) {
+ return fltk3::message_hotspot();
+}
+inline void fl_message_title(const char *title) {
+ fltk3::message_title(title);
+}
+
+inline void fl_message_title_default(const char *title) {
+ fltk3::message_title_default(title);
+}
+
+#if 0 // FIXME: 123
// pointers you can use to change FLTK to a foreign language:
extern inline const char* fl_no;
extern inline const char* fl_yes;
Modified: branches/branch-3.0/fltk3/Tree.h
===================================================================
--- branches/branch-3.0/fltk3/Tree.h 2011-06-19 20:44:06 UTC (rev 8826)
+++ branches/branch-3.0/fltk3/Tree.h 2011-06-19 21:28:45 UTC (rev 8827)
@@ -13,6 +13,8 @@
#include <fltk3/TreeItem.h>
#include <fltk3/TreePrefs.h>
+class Fl_Tree;
+
namespace fltk3 {
//////////////////////
@@ -199,6 +201,9 @@
class FLTK3_EXPORT Tree : public fltk3::Group {
+
+ friend class ::Fl_Tree;
+
fltk3::TreeItem *_root; // can be null!
fltk3::TreeItem *_item_focus; // item that has focus
box
fltk3::TreeItem *_callback_item; // item invoked during callback
(can be NULL)
Modified: branches/branch-3.0/fltk3/ask.h
===================================================================
--- branches/branch-3.0/fltk3/ask.h 2011-06-19 20:44:06 UTC (rev 8826)
+++ branches/branch-3.0/fltk3/ask.h 2011-06-19 21:28:45 UTC (rev 8827)
@@ -63,9 +63,13 @@
// which does not conform to the current FLTK Human Interface Guidelines.
// Use fltk3::choice() instead with the appropriate verbs instead.
FLTK3_EXPORT int ask(const char *,...) __fl_attr((__format__ (__printf__, 1,
2), __deprecated__));
+ FLTK3_EXPORT int ask(va_list, const char *);
FLTK3_EXPORT int choice(const char *q,const char *b0,const char *b1,const
char *b2,...) __fl_attr((__format__ (__printf__, 1, 5)));
+ FLTK3_EXPORT int choice(va_list, const char *, const char *, const char *,
const char *);
FLTK3_EXPORT const char *input(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
+ FLTK3_EXPORT const char *input(va_list, const char *, const char *d=0);
FLTK3_EXPORT const char *password(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
+ FLTK3_EXPORT const char *password(va_list, const char *, const char *d=0);
FLTK3_EXPORT Widget *message_icon();
extern FLTK3_EXPORT Font message_font_;
Modified: branches/branch-3.0/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0/src/fl_ask.cxx 2011-06-19 20:44:06 UTC (rev 8826)
+++ branches/branch-3.0/src/fl_ask.cxx 2011-06-19 21:28:45 UTC (rev 8827)
@@ -380,17 +380,17 @@
\retval 1 if yes is selected
*/
int fltk3::ask(const char *fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ int ret = ask(ap, fmt);
+ va_end(ap);
+ return ret;
+}
+int fltk3::ask(va_list ap, const char *fmt) {
if (avoidRecursion) return 0;
-
- va_list ap;
-
fltk3::beep(fltk3::BEEP_QUESTION);
-
- va_start(ap, fmt);
int r = innards(fmt, ap, fltk3::no, fltk3::yes, 0);
- va_end(ap);
-
return r;
}
@@ -409,19 +409,21 @@
\retval 1 if the second button with \p b1 text is selected
\retval 2 if the third button with \p b2 text is selected
*/
-int fltk3::choice(const char*fmt,const char *b0,const char *b1,const char
*b2,...){
-
+int fltk3::choice(const char*fmt,const char *b0,const char *b1,const char
*b2,...) {
+ va_list ap;
+ va_start(ap, b2);
+ int ret = choice(ap, fmt, b0, b1, b2);
+ va_end(ap);
+ return ret;
+}
+
+int fltk3::choice(va_list ap, const char*fmt,const char *b0,const char
*b1,const char *b2) {
if (avoidRecursion) return 0;
-
- va_list ap;
-
fltk3::beep(fltk3::BEEP_QUESTION);
-
- va_start(ap, b2);
int r = innards(fmt, ap, b0, b1, b2);
- va_end(ap);
return r;
}
+
/** Gets the fltk3::Box icon container of the current default dialog used in
many common dialogs like fltk3::message(), fltk3::alert(),
fltk3::ask(), fltk3::choice(), fltk3::input(), fltk3::password()
@@ -455,15 +457,17 @@
\return the user string input if OK was pushed, NULL if Cancel was pushed
or another dialog box was still open
*/
const char* fltk3::input(const char *fmt, const char *defstr, ...) {
+ va_list ap;
+ va_start(ap, defstr);
+ const char *ret = input(ap, fmt, defstr);
+ va_end(ap);
+ return ret;
+}
+const char* fltk3::input(va_list ap, const char *fmt, const char *defstr) {
if (avoidRecursion) return 0;
-
fltk3::beep(fltk3::BEEP_QUESTION);
-
- va_list ap;
- va_start(ap, defstr);
const char* r = input_innards(fmt, ap, defstr, fltk3::NORMAL_INPUT);
- va_end(ap);
return r;
}
@@ -481,15 +485,17 @@
\return the user string input if OK was pushed, NULL if Cancel was pushed
or aother dialog box was still open
*/
const char *fltk3::password(const char *fmt, const char *defstr, ...) {
+ va_list ap;
+ va_start(ap, defstr);
+ const char *ret = password(ap, fmt, defstr);
+ va_end(ap);
+ return ret;
+}
+const char *fltk3::password(va_list ap, const char *fmt, const char *defstr) {
if (avoidRecursion) return 0;
-
fltk3::beep(fltk3::BEEP_PASSWORD);
-
- va_list ap;
- va_start(ap, defstr);
const char* r = input_innards(fmt, ap, defstr, fltk3::SECRET_INPUT);
- va_end(ap);
return r;
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
