summaryrefslogtreecommitdiff
path: root/fluid/nodes/Widget_Node.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'fluid/nodes/Widget_Node.cxx')
-rw-r--r--fluid/nodes/Widget_Node.cxx64
1 files changed, 41 insertions, 23 deletions
diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx
index d5d256dbe..757155335 100644
--- a/fluid/nodes/Widget_Node.cxx
+++ b/fluid/nodes/Widget_Node.cxx
@@ -51,8 +51,6 @@
#define MAX(a,b) ((a)>=(b) ? (a) : (b))
#endif
-using namespace fld;
-using namespace fld::proj;
extern void redraw_browser();
@@ -386,7 +384,8 @@ void name_public_cb(Fl_Choice* i, void* v) {
i->show();
} else {
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
((Widget_Node*)o)->public_ = i->value();
mod = 1;
@@ -433,7 +432,8 @@ void label_cb(Fl_Input* i, void* v) {
if (i->changed()) {
Fluid.proj.undo.suspend();
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
if (!mod) {
if (first_change) {
@@ -724,7 +724,8 @@ Fl_Menu_Item boxmenu[] = {
const char* boxname(int i) {
if (!i) i = ZERO_ENTRY;
- for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
+ int j;
+ for (j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
if (boxmenu[j].argument() == i)
return boxmenu[j].label();
return 0;
@@ -733,7 +734,8 @@ const char* boxname(int i) {
int boxnumber(const char* i) {
if (i[0]=='F' && i[1]=='L' && i[2]=='_')
i += 3;
- for (int j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
+ int j;
+ for (j = 0; j < int(sizeof(boxmenu)/sizeof(*boxmenu)); j++)
if (boxmenu[j].label() && !strcmp(boxmenu[j].label(), i)) {
return int(boxmenu[j].argument());
}
@@ -896,7 +898,8 @@ void labeltype_cb(Fl_Choice* i, void* v) {
if (v == LOAD) {
int n = current_widget->o->labeltype();
i->when(FL_WHEN_RELEASE);
- for (int j = 0; j < int(sizeof(labeltypemenu)/sizeof(*labeltypemenu)); j++) {
+ int j;
+ for (j = 0; j < int(sizeof(labeltypemenu)/sizeof(*labeltypemenu)); j++) {
if (labeltypemenu[j].argument() == n) {
i->value(j);
break;
@@ -908,7 +911,8 @@ void labeltype_cb(Fl_Choice* i, void* v) {
int n = int(labeltypemenu[m].argument());
if (n<0)
return; // should not happen
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* p = (Widget_Node*)o;
p->o->labeltype((Fl_Labeltype)n);
@@ -943,7 +947,8 @@ Fl_Menu_Item colormenu[] = {
void color_common(Fl_Color c) {
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
q->o->color(c); q->o->redraw();
@@ -963,7 +968,8 @@ void color_common(Fl_Color c) {
void color2_common(Fl_Color c) {
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
q->o->selection_color(c); q->o->redraw();
@@ -978,7 +984,8 @@ void color2_common(Fl_Color c) {
void labelcolor_common(Fl_Color c) {
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
q->o->labelcolor(c); q->redraw();
@@ -1029,7 +1036,8 @@ void align_cb(Fl_Button* i, void* v) {
} else {
int mod = 0;
Fluid.proj.undo.checkpoint();
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
Fl_Align x = q->o->align();
@@ -1079,7 +1087,8 @@ void align_position_cb(Fl_Choice* i, void* v) {
Fl_Align b = Fl_Align(fl_uintptr_t(mi->user_data()));
int mod = 0;
Fluid.proj.undo.checkpoint();
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
Fl_Align x = q->o->align();
@@ -1114,7 +1123,8 @@ void align_text_image_cb(Fl_Choice* i, void* v) {
Fl_Align b = Fl_Align(fl_uintptr_t(mi->user_data()));
int mod = 0;
Fluid.proj.undo.checkpoint();
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
Fl_Align x = q->o->align();
@@ -1156,7 +1166,8 @@ int Widget_Node::textstuff(int, Fl_Font&, int&, Fl_Color&) {
void textcolor_common(Fl_Color c) {
Fl_Font n; int s;
int mod = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->selected && o->is_widget()) {
Widget_Node* q = (Widget_Node*)o;
q->textstuff(3,n,s,c); q->o->redraw();
@@ -1245,7 +1256,8 @@ Fl_Menu_Item* Widget_Node::subtypes() { return 0; }
void propagate_load(Fl_Group* g, void* v) {
if (v == LOAD) {
Fl_Widget*const* a = g->array();
- for (int i=g->children(); i--;) {
+ int i;
+ for (i =g->children(); i--;) {
Fl_Widget* o = *a++;
o->do_callback(o, LOAD, FL_REASON_USER);
}
@@ -1255,7 +1267,8 @@ void propagate_load(Fl_Group* g, void* v) {
void set_cb(Fl_Button*, void*) {
haderror = 0;
Fl_Widget*const* a = the_panel->array();
- for (int i=the_panel->children(); i--;) {
+ int i;
+ for (i =the_panel->children(); i--;) {
Fl_Widget* o = *a++;
if (o->changed()) {
o->do_callback();
@@ -1391,7 +1404,8 @@ void load_panel() {
current_node = 0;
if (Fluid.proj.tree.current->is_widget())
current_widget=(Widget_Node*)Fluid.proj.tree.current;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ Node *o;
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
if (o->is_widget() && o->selected) {
numselected++;
if (!current_widget) current_widget = (Widget_Node*)o;
@@ -1468,12 +1482,13 @@ extern void update_codeview_position();
// old panel in that case, as the object may no longer exist)
void selection_changed(Node* p) {
// store all changes to the current selected objects:
+ Node *o;
if (p && the_panel && the_panel->visible()) {
set_cb(0,0);
// if there was an error, we try to leave the selected set unchanged:
if (haderror) {
Node* q = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
o->new_selected = o->selected;
if (!q && o->selected) q = o;
}
@@ -1485,7 +1500,7 @@ void selection_changed(Node* p) {
}
// update the selected flags to new set:
Node* q = 0;
- for (Node* o = Fluid.proj.tree.first; o; o = o->next) {
+ for (o = Fluid.proj.tree.first; o; o = o->next) {
o->selected = o->new_selected;
if (!q && o->selected) q = o;
}
@@ -1626,7 +1641,8 @@ void Widget_Node::write_static(fld::io::Code_Writer& f) {
f.write_c("void %s::%s(%s* o, %s v) {\n", k, cn, t, ut);
f.write_c("%s((%s*)(o", f.indent(1), k);
Node* q = 0;
- for (Node* p = parent; p && p->is_widget(); q = p, p = p->parent)
+ Node *p;
+ for (p = parent; p && p->is_widget(); q = p, p = p->parent)
f.write_c("->parent()");
if (!q || !q->is_a(FLD_NODE_TYPE_Widget_Class))
f.write_c("->user_data()");
@@ -2018,7 +2034,8 @@ void Widget_Node::write_widget_code(fld::io::Code_Writer& f) {
}
void Widget_Node::write_extra_code(fld::io::Code_Writer& f) {
- for (int n=0; n < NUM_EXTRA_CODE; n++)
+ int n;
+ for (n =0; n < NUM_EXTRA_CODE; n++)
if (extra_code(n) && extra_code(n)[0] && !isdeclare(extra_code(n)))
f.write_c("%s%s\n", f.indent(), extra_code(n));
}
@@ -2158,7 +2175,8 @@ void Widget_Node::write_properties(fld::io::Project_Writer &f) {
if (resizable()) f.write_string("resizable");
if (hotspot()) f.write_string(is_a(FLD_NODE_TYPE_Menu_Item) ? "divider" : "hotspot");
if (menu_headline()) f.write_string("headline");
- for (int n=0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && extra_code(n)[0]) {
+ int n;
+ for (n =0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && extra_code(n)[0]) {
f.write_indent(level+1);
f.write_string("code%d",n);
f.write_word(extra_code(n));
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 02:26:48 +0000