Author: matt
Date: 2011-06-25 10:42:34 -0700 (Sat, 25 Jun 2011)
New Revision: 8841
Log:
123: all tests compile (some crash). Commited from a train in the Rhine are in
the middle of Germany - because I can ;-P
Modified:
branches/branch-3.0/FL/Fl_Tree.H
branches/branch-3.0/FL/Fl_Tree_Item.H
Modified: branches/branch-3.0/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree.H 2011-06-24 20:46:09 UTC (rev 8840)
+++ branches/branch-3.0/FL/Fl_Tree.H 2011-06-25 17:42:34 UTC (rev 8841)
@@ -194,26 +194,49 @@
return ((fltk3::Tree*)_p)->select((fltk3::TreeItem*)item, docallback);
}
-#if 0
int select(const char *path, int docallback=1) {
+ return ((fltk3::Tree*)_p)->select(path, docallback);
}
+
void select_toggle(Fl_Tree_Item *item, int docallback=1) {
+ ((fltk3::Tree*)_p)->select_toggle((fltk3::TreeItem*)item, docallback);
}
+
int deselect(Fl_Tree_Item *item, int docallback=1) {
+ return ((fltk3::Tree*)_p)->deselect((fltk3::TreeItem*)item, docallback);
}
+
int deselect(const char *path, int docallback=1) {
+ return ((fltk3::Tree*)_p)->deselect(path, 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);
+
+ int deselect_all(Fl_Tree_Item *item=0, int docallback=1) {
+ return ((fltk3::Tree*)_p)->deselect_all((fltk3::TreeItem*)item,
docallback);
+ }
+
+ int select_only(Fl_Tree_Item *selitem, int docallback=1) {
+ return ((fltk3::Tree*)_p)->select_only((fltk3::TreeItem*)selitem,
docallback);
+ }
+
+ int select_all(Fl_Tree_Item *item=0, int docallback=1) {
+ return ((fltk3::Tree*)_p)->select_all((fltk3::TreeItem*)item, docallback);
+ }
+
+ void set_item_focus(Fl_Tree_Item *o) {
+ ((fltk3::Tree*)_p)->set_item_focus((fltk3::TreeItem*)o);
+ }
+
int is_selected(Fl_Tree_Item *item) const {
+ return ((fltk3::Tree*)_p)->is_selected((fltk3::TreeItem*)item);
}
+
int is_selected(const char *path) {
+ return ((fltk3::Tree*)_p)->is_selected(path);
}
+
void show_self() {
+ ((fltk3::Tree*)_p)->show_self();
}
-#endif
Fl_Fontsize item_labelsize() const {
return fltk3::_3to1_fontsize( ((fltk3::Tree*)_p)->item_labelsize() );
@@ -247,28 +270,44 @@
((fltk3::Tree*)_p)->item_labelbgcolor( fltk3::_1to3_color(val) );
}
-#if 0
Fl_Color connectorcolor() const {
+ return fltk3::_3to1_color( ((fltk3::Tree*)_p)->connectorcolor() );
}
+
void connectorcolor(Fl_Color val) {
+ ((fltk3::Tree*)_p)->connectorcolor( fltk3::_1to3_color(val) );
}
+
int marginleft() const {
+ return ((fltk3::Tree*)_p)->marginleft();
}
+
void marginleft(int val) {
+ ((fltk3::Tree*)_p)->marginleft(val);
}
+
int margintop() const {
+ return ((fltk3::Tree*)_p)->margintop();
}
+
void margintop(int val) {
+ ((fltk3::Tree*)_p)->margintop(val);
}
+
int openchild_marginbottom() const {
+ return ((fltk3::Tree*)_p)->openchild_marginbottom();
}
+
void openchild_marginbottom(int val) {
+ ((fltk3::Tree*)_p)->openchild_marginbottom(val);
}
+
int connectorwidth() const {
+ return ((fltk3::Tree*)_p)->connectorwidth();
}
void connectorwidth(int val) {
+ ((fltk3::Tree*)_p)->connectorwidth(val);
}
-#endif
Fl_Image *usericon() const {
return fltk3::_3to1_image( ((fltk3::Tree*)_p)->usericon() );
@@ -278,28 +317,45 @@
((fltk3::Tree*)_p)->usericon( fltk3::_1to3_image(val) );
}
-#if 0
Fl_Image *openicon() const {
+ return fltk3::_3to1_image( ((fltk3::Tree*)_p)->openicon() );
}
+
void openicon(Fl_Image *val) {
+ ((fltk3::Tree*)_p)->openicon( fltk3::_1to3_image(val) );
}
+
Fl_Image *closeicon() const {
+ return fltk3::_3to1_image( ((fltk3::Tree*)_p)->closeicon() );
}
+
void closeicon(Fl_Image *val) {
+ ((fltk3::Tree*)_p)->closeicon( fltk3::_1to3_image(val) );
}
+
int showcollapse() const {
+ return ((fltk3::Tree*)_p)->showcollapse();
}
+
void showcollapse(int val) {
+ ((fltk3::Tree*)_p)->showcollapse(val);
}
+
int showroot() const {
+ return ((fltk3::Tree*)_p)->showroot();
}
+
void showroot(int val) {
+ ((fltk3::Tree*)_p)->showroot(val);
}
+
Fl_Tree_Connector connectorstyle() const {
+ return (Fl_Tree_Connector)((fltk3::Tree*)_p)->connectorstyle();
}
+
void connectorstyle(Fl_Tree_Connector val) {
+ ((fltk3::Tree*)_p)->connectorstyle((fltk3::TreeConnector)val);
}
-#endif
Fl_Tree_Sort sortorder() const {
return (Fl_Tree_Sort)((fltk3::Tree*)_p)->sortorder();
@@ -314,22 +370,55 @@
}
void selectbox(Fl_Boxtype val) {
}
+#endif
+
Fl_Tree_Select selectmode() const {
+ return (Fl_Tree_Select)((fltk3::Tree*)_p)->selectmode();
}
+
void selectmode(Fl_Tree_Select val) {
+ ((fltk3::Tree*)_p)->selectmode((fltk3::TreeSelect)val);
}
- int displayed(Fl_Tree_Item *item);
- void show_item(Fl_Tree_Item *item, int yoff);
- void show_item(Fl_Tree_Item *item);
- void show_item_bottom(Fl_Tree_Item *item);
- void show_item_middle(Fl_Tree_Item *item);
- void show_item_top(Fl_Tree_Item *item);
- void display(Fl_Tree_Item *item);
- int vposition() const;
- void vposition(int ypos);
+
+ int displayed(Fl_Tree_Item *item) {
+ return ((fltk3::Tree*)_p)->displayed((fltk3::TreeItem*)item);
+ }
+
+ void show_item(Fl_Tree_Item *item, int yoff){
+ ((fltk3::Tree*)_p)->show_item((fltk3::TreeItem*)item, yoff);
+ }
+
+ void show_item(Fl_Tree_Item *item) {
+ ((fltk3::Tree*)_p)->show_item((fltk3::TreeItem*)item);
+ }
+
+ void show_item_bottom(Fl_Tree_Item *item) {
+ ((fltk3::Tree*)_p)->show_item_bottom((fltk3::TreeItem*)item);
+ }
+
+ void show_item_middle(Fl_Tree_Item *item) {
+ ((fltk3::Tree*)_p)->show_item_middle((fltk3::TreeItem*)item);
+ }
+
+ void show_item_top(Fl_Tree_Item *item) {
+ ((fltk3::Tree*)_p)->show_item_top((fltk3::TreeItem*)item);
+ }
+
+ void display(Fl_Tree_Item *item) {
+ ((fltk3::Tree*)_p)->display((fltk3::TreeItem*)item);
+ }
+
+ int vposition() const {
+ return ((fltk3::Tree*)_p)->vposition();
+ }
+
+ void vposition(int ypos) {
+ ((fltk3::Tree*)_p)->vposition(ypos);
+ }
+
int is_scrollbar(Fl_Widget *w) {
+ return ((fltk3::Tree*)_p)->is_scrollbar(fltk3::_1to3_widget(w));
}
-#endif
int scrollbar_size() const {
return ((fltk3::Tree*)_p)->scrollbar_size();
Modified: branches/branch-3.0/FL/Fl_Tree_Item.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tree_Item.H 2011-06-24 20:46:09 UTC (rev
8840)
+++ branches/branch-3.0/FL/Fl_Tree_Item.H 2011-06-25 17:42:34 UTC (rev
8841)
@@ -116,14 +116,17 @@
Fl_Color labelbgcolor() const {
return(_labelbgcolor);
}
- /// Assign an FLTK widget to this item.
+#endif
+
void widget(Fl_Widget *val) {
- _widget = val;
+ fltk3::TreeItem::widget( fltk3::_1to3_widget(val) );
}
- /// Return FLTK widget assigned to this item.
+
Fl_Widget *widget() const {
- return(_widget);
+ return fltk3::_3to1_widget( fltk3::TreeItem::widget() );
}
+
+#if 0
/// Return the number of children this item has.
int children() const {
return(_children.total());
@@ -157,21 +160,37 @@
Fl_Tree_Item *insert(const Fl_Tree_Prefs &prefs, const char *new_label, int
pos=0);
Fl_Tree_Item *insert_above(const Fl_Tree_Prefs &prefs, const char
*new_label);
int depth() const;
- Fl_Tree_Item *prev();
- Fl_Tree_Item *next();
- Fl_Tree_Item *next_sibling();
- Fl_Tree_Item *prev_sibling();
+#endif
+ Fl_Tree_Item *prev() {
+ return (Fl_Tree_Item*)fltk3::TreeItem::prev();
+ }
+
+ Fl_Tree_Item *next() {
+ return (Fl_Tree_Item*)fltk3::TreeItem::next();
+ }
+
+ Fl_Tree_Item *next_sibling() {
+ return (Fl_Tree_Item*)fltk3::TreeItem::next_sibling();
+ }
+
+ Fl_Tree_Item *prev_sibling() {
+ return (Fl_Tree_Item*)fltk3::TreeItem::prev_sibling();
+ }
+
+#if 0
Fl_Tree_Item *next_displayed(Fl_Tree_Prefs &prefs);
Fl_Tree_Item *prev_displayed(Fl_Tree_Prefs &prefs);
-
- /// Return the parent for this item. Returns NULL if we are the root.
+#endif
+
Fl_Tree_Item *parent() {
- return(_parent);
+ return (Fl_Tree_Item*)fltk3::TreeItem::parent();
}
- /// Return the const parent for this item. Returns NULL if we are the root.
+
const Fl_Tree_Item *parent() const {
- return(_parent);
+ return (Fl_Tree_Item*)fltk3::TreeItem::parent();
}
+
+#if 0
/// Set the parent for this item.
/// Should only be used by Fl_Tree's internals.
///
@@ -286,15 +305,17 @@
return(_visible ? 1 : 0);
}
int visible_r() const;
+#endif
- /// Set the user icon's image. '0' will disable.
void usericon(Fl_Image *val) {
- _usericon = val;
+ fltk3::TreeItem::usericon(fltk3::_1to3_image(val));
}
- /// Get the user icon. Returns '0' if disabled.
+
Fl_Image *usericon() const {
- return(_usericon);
+ return fltk3::_3to1_image( fltk3::TreeItem::usericon() );
}
+
+#if 0
//////////////////
// Events
//////////////////
_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
