diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-02-20 21:14:47 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-02-20 21:14:47 +0000 |
| commit | 2f82fd066321cde3e225fc87a9469849215413eb (patch) | |
| tree | 0fb84acd8268a37ab45c2f2b3c358f6c962e75ea /FL | |
| parent | 7ae0c170ad2f63ac7e27d0496cd9c167e2bd0cbd (diff) | |
Mixed bag. Please see CHANGES.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7117 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Preferences.H | 17 | ||||
| -rw-r--r-- | FL/Fl_Table.H | 2 | ||||
| -rw-r--r-- | FL/forms.H | 5 |
3 files changed, 16 insertions, 8 deletions
diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H index 798e421d6..f6130ce70 100644 --- a/FL/Fl_Preferences.H +++ b/FL/Fl_Preferences.H @@ -211,8 +211,19 @@ private: RootNode *root_; // top_ bit set }; char *path_; + Entry *entry_; + int nEntry_, NEntry_; unsigned char dirty_:1; unsigned char top_:1; + unsigned char indexed_:1; + // indexing routines + Node **index_; + int nIndex_, NIndex_; + void createIndex(); + void updateIndex(); + void deleteIndex(); + public: + static int lastEntrySet; public: Node( const char *path ); ~Node(); @@ -242,10 +253,8 @@ private: int getEntry( const char *name ); char deleteEntry( const char *name ); void deleteAllEntries(); - // public values - Entry *entry; - int nEntry, NEntry; - static int lastEntrySet; + int nEntry() { return nEntry_; } + Entry &entry(int i) { return entry_[i]; } }; friend class Node; diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H index 4190a4b11..3f0bf4c53 100644 --- a/FL/Fl_Table.H +++ b/FL/Fl_Table.H @@ -865,7 +865,7 @@ public: } else { table->hide(); } - Fl_Group::current((Fl_Group*)(Fl_Group::parent())); + Fl_Group::current(Fl_Group::parent()); } Fl_Widget * const *array() { return(table->array()); diff --git a/FL/forms.H b/FL/forms.H index 8bf0520a2..440df8073 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -239,13 +239,12 @@ inline void fl_redraw_object(Fl_Widget* o) {o->redraw();} inline void fl_show_object(Fl_Widget* o) {o->show();} inline void fl_hide_object(Fl_Widget* o) {o->hide();} inline void fl_free_object(Fl_Widget* x) {delete x;} -inline void fl_delete_object(Fl_Widget* o) {((Fl_Group*)(o->parent()))->remove(*o);} +inline void fl_delete_object(Fl_Widget* o) {o->parent()->remove(*o);} inline void fl_activate_object(Fl_Widget* o) {o->activate();} inline void fl_deactivate_object(Fl_Widget* o) {o->deactivate();} inline void fl_add_object(Fl_Window* f, Fl_Widget* x) {f->add(x);} -inline void fl_insert_object(Fl_Widget* o, Fl_Widget* b) { - ((Fl_Group*)(b->parent()))->insert(*o,b);} +inline void fl_insert_object(Fl_Widget* o, Fl_Widget* b) {b->parent()->insert(*o,b);} inline Fl_Window* FL_ObjWin(Fl_Widget* o) {return o->window();} |