diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-08-05 08:01:40 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-08-05 08:01:40 +0000 |
| commit | 16a999efd0f14f0a99fb01c4e8484ace744fd416 (patch) | |
| tree | b8fc60dab27eeb0e74bbfd075f971cb93d61334a /fluid/Fl_Type.h | |
| parent | 243525a9036b6221408bcf7ba234d6385d3a9c60 (diff) | |
Fixed so that a public declaration like #include "Foo" is written to the
header file in the correct order, before anything written by an later
object in the fl file. It used to write the extern callback definitions
first, this would fail if they used a type that was in the header file.
This also simplified the (still messy) code by getting rid of the
write_declare() virtual function.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Type.h')
| -rw-r--r-- | fluid/Fl_Type.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 6ce76155e..167540c49 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -1,5 +1,5 @@ // -// "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $" +// "$Id: Fl_Type.h,v 1.5.2.3 1999/08/05 08:01:36 bill Exp $" // // Widget type header file for the Fast Light Tool Kit (FLTK). // @@ -106,7 +106,6 @@ public: virtual int read_fdesign(const char*, const char*); // write code, these are called in order: - virtual void write_declare(); // write #include and #define to .h file virtual void write_static(); // write static stuff to .c file virtual void write_code1(); // code and .h before children virtual void write_code2(); // code and .h after children @@ -132,7 +131,6 @@ class Fl_Function_Type : public Fl_Type { char public_, constructor, havewidgets; public: Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -150,7 +148,6 @@ public: class Fl_Code_Type : public Fl_Type { public: Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -162,7 +159,6 @@ class Fl_CodeBlock_Type : public Fl_Type { const char* after; public: Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -177,7 +173,6 @@ class Fl_Decl_Type : public Fl_Type { char public_; public: Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -190,7 +185,6 @@ class Fl_DeclBlock_Type : public Fl_Type { const char* after; public: Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -210,7 +204,6 @@ public: Fl_Class_Type* parent_class; // save class if nested // Fl_Type *make(); - void write_declare(); void write_code1(); void write_code2(); void open(); @@ -235,7 +228,6 @@ class Fl_Widget_Type : public Fl_Type { protected: - void write_declare(); void write_static(); void write_code1(); void write_widget_code(); @@ -398,7 +390,6 @@ public: int is_button() const {return 1;} // this gets shortcut to work Fl_Widget* widget(int,int,int,int) {return 0;} Fl_Widget_Type* _make() {return 0;} - void write_declare(); const char* menu_name(int& i); int flags(); void write_static(); @@ -525,5 +516,5 @@ int storestring(const char *n, const char * & p, int nostrip=0); extern int include_H_from_C; // -// End of "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $". +// End of "$Id: Fl_Type.h,v 1.5.2.3 1999/08/05 08:01:36 bill Exp $". // |