diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-01-04 22:18:40 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-01-04 22:18:40 +0000 |
| commit | cc1de3395040b4087d26b66cf2c6510ba7ab054a (patch) | |
| tree | 9a26173740ee8165fc4d7482e1fd35a016b714d6 | |
| parent | a1f96ffea02ffd023897fd23328d20f66c11212e (diff) | |
STR #1741: fixed and improved on missing 'public' attribute in consecutive classes in FLUID
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6013 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | fluid/Fl_Function_Type.cxx | 2 | ||||
| -rw-r--r-- | fluid/code.cxx | 3 |
3 files changed, 6 insertions, 1 deletions
@@ -5,6 +5,8 @@ CHANGES IN FLTK 1.1.8 STR #1639, STR #1645, STR #1644, STR #1792, STR #1793, STR #1742, STR #1777, STR #1794, STR #1827, STR #1843, STR #1796, STR #1815, STR #1726, STR #1753) + - Fixed method attributes in consecutive class + declarations in FLUID (STR #1741) - FLUID checks for seperately declared callbacks to avoid a bogus "extern" declaration (STR #1776) - Added "protected" class memebrs in FLUID diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index cbe3edd1a..62abb293c 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -1132,7 +1132,7 @@ void Fl_Class_Type::open() { Fl_Class_Type Fl_Class_type; -static Fl_Class_Type *current_class; +Fl_Class_Type *current_class; extern Fl_Widget_Class_Type *current_widget_class; void write_public(int state) { if (!current_class && !current_widget_class) return; diff --git a/fluid/code.cxx b/fluid/code.cxx index 7c3848e77..32162003d 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -330,6 +330,7 @@ static Fl_Type* write_code(Fl_Type* p) { } extern const char* header_file_name; +extern Fl_Class_Type *current_class; int write_code(const char *s, const char *t) { const char *filemode = "w"; @@ -338,6 +339,8 @@ int write_code(const char *s, const char *t) { write_number++; delete id_root; id_root = 0; indentation = 0; + current_class = 0L; + current_widget_class = 0L; if (!s) code_file = stdout; else { FILE *f = fopen(s, filemode); |