summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2005-07-20 13:20:14 +0000
committerMatthias Melcher <fltk@matthiasm.com>2005-07-20 13:20:14 +0000
commit394ab6af409e790054503f0adcac54dfef37e81f (patch)
tree4d75f07329a3990c97dd3ba0c56e0b124aaf1cbb
parentbb2394055d9085df72e885e14c659c686bf7fae2 (diff)
Declaration in Fluid now uses its own public/private setting unless the parent is a private declaration block, which sets contained declarations to private as well.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4439 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--fluid/Fl_Function_Type.cxx2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 975512d65..fd4beb627 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745, STR #942)
+ - Fluid Declaration private flag fixed (STR #799)
- Fluid overlay now shows a seperate bounding box of selected
items with correct handles and a dotted boundig box for all
labels (STR #790)
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 303ff728e..3f4ea2e11 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -467,7 +467,7 @@ void Fl_CodeBlock_Type::write_code2() {
int Fl_Decl_Type::is_public() const
{
- Fl_Type *p = Fl_Type::current;
+ Fl_Type *p = parent;
while (p && !p->is_decl_block()) p = p->parent;
if(p && p->is_public() && public_)
return public_;