diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-09-10 03:09:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-09-10 03:09:43 +0000 |
| commit | 743cd4f95d6b3e9ad2cfe7c299647f2260791b76 (patch) | |
| tree | a8f9fd164c29fa3141e5bd78f0f74243039ec20d /FL | |
| parent | c15ea394d02de7bfaf9034d3563c7607b70d0684 (diff) | |
HelpView/HelpDialog updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1585 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_HelpDialog.H | 4 | ||||
| -rw-r--r-- | FL/Fl_HelpView.H | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/FL/Fl_HelpDialog.H b/FL/Fl_HelpDialog.H index 05756cbe0..cd8ee2154 100644 --- a/FL/Fl_HelpDialog.H +++ b/FL/Fl_HelpDialog.H @@ -3,7 +3,7 @@ #ifndef Fl_HelpDialog_H #define Fl_HelpDialog_H #include <FL/Fl.H> -#include <FL/Fl_Window.H> +#include <FL/Fl_Double_Window.H> #include <string.h> #include <FL/Fl_HelpView.H> #include <FL/Fl_Button.H> @@ -16,7 +16,7 @@ class Fl_HelpDialog { public: Fl_HelpDialog(); private: - Fl_Window *window_; + Fl_Double_Window *window_; Fl_HelpView *view_; inline void cb_view__i(Fl_HelpView*, void*); static void cb_view_(Fl_HelpView*, void*); diff --git a/FL/Fl_HelpView.H b/FL/Fl_HelpView.H index 2cf6b7349..eea75ea04 100644 --- a/FL/Fl_HelpView.H +++ b/FL/Fl_HelpView.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_HelpView.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $" +// "$Id: Fl_HelpView.H,v 1.1.2.3 2001/09/10 03:09:43 easysw Exp $" // // Help Viewer widget definitions. // @@ -101,6 +101,7 @@ struct Fl_HelpImage hattr[8]; // Height attribute Fl_Image *image; // FLTK image representation unsigned char *data; // Raw image data + int copy; // Data is a copy? int w, h, d; // Image size & depth }; @@ -157,12 +158,14 @@ class Fl_HelpView : public Fl_Group //// Help viewer widget int load_png(Fl_HelpImage *img, FILE *fp); Fl_HelpBlock *add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0); + static int compare_blocks(const void *a, const void *b); void add_link(const char *n, int xx, int yy, int ww, int hh); void add_target(const char *n, int yy); static int compare_targets(const Fl_HelpTarget *t0, const Fl_HelpTarget *t1); int do_align(Fl_HelpBlock *block, int line, int xx, int a, int &l); void draw(); void format(); + void format_table(int *table_width, int *columns, const char *table); int get_align(const char *p, int a); const char *get_attr(const char *p, const char *n, char *buf, int bufsize); Fl_Color get_color(const char *n, Fl_Color c); @@ -207,5 +210,5 @@ class Fl_HelpView : public Fl_Group //// Help viewer widget #endif // !_Fl_HelpView_H_ // -// End of "$Id: Fl_HelpView.H,v 1.1.2.2 2001/08/06 23:51:39 easysw Exp $". +// End of "$Id: Fl_HelpView.H,v 1.1.2.3 2001/09/10 03:09:43 easysw Exp $". // |