Author: matt
Date: 2008-01-04 14:18:40 -0800 (Fri, 04 Jan 2008)
New Revision: 6013
Log:
STR #1741: fixed and improved on missing 'public' attribute in consecutive
classes in FLUID
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/fluid/Fl_Function_Type.cxx
branches/branch-1.1/fluid/code.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2008-01-04 21:45:49 UTC (rev 6012)
+++ branches/branch-1.1/CHANGES 2008-01-04 22:18:40 UTC (rev 6013)
@@ -5,6 +5,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
Modified: branches/branch-1.1/fluid/Fl_Function_Type.cxx
===================================================================
--- branches/branch-1.1/fluid/Fl_Function_Type.cxx 2008-01-04 21:45:49 UTC
(rev 6012)
+++ branches/branch-1.1/fluid/Fl_Function_Type.cxx 2008-01-04 22:18:40 UTC
(rev 6013)
@@ -1132,7 +1132,7 @@
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;
Modified: branches/branch-1.1/fluid/code.cxx
===================================================================
--- branches/branch-1.1/fluid/code.cxx 2008-01-04 21:45:49 UTC (rev 6012)
+++ branches/branch-1.1/fluid/code.cxx 2008-01-04 22:18:40 UTC (rev 6013)
@@ -330,6 +330,7 @@
}
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 @@
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);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
