summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2000-05-26 08:46:17 +0000
committerBill Spitzak <spitzak@gmail.com>2000-05-26 08:46:17 +0000
commit1422995c2db757a16d62a2c392e186ca365fc5b3 (patch)
tree30ed9aafbb881e70c8bac2234b055ab6a24df9f0
parentd7f026e02e4bc9eaae845fc0e506a924a9442fcd (diff)
Fl_Double_Window is saved in .fl file
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1142 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--fluid/Fl_Widget_Type.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index b79512ecd..5b172cc24 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.13 2000/05/16 12:26:03 mike Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.14 2000/05/26 08:46:17 bill Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@@ -1332,8 +1332,6 @@ void Fl_Widget_Type::write_code1() {
write_c("new %s(0, 0, %d, %d", t, o->w(), o->h());
else
write_c("new %s(%d, %d", t, o->w(), o->h());
- // prevent type() code from being emitted:
- ((Fl_Widget_Type*)factory)->o->type(o->type());
} else {
write_c("new %s(%d, %d, %d, %d", t, o->x(), o->y(), o->w(), o->h());
}
@@ -1365,7 +1363,7 @@ void Fl_Widget_Type::write_code1() {
// this is split from write_code1() for Fl_Window_Type:
void Fl_Widget_Type::write_widget_code() {
Fl_Widget* tplate = ((Fl_Widget_Type*)factory)->o;
- if (o->type() != tplate->type())
+ if (o->type() != tplate->type() && !is_window())
write_c("%so->type(%d);\n", indent(), o->type());
if (o->box() != tplate->box())
write_c("%so->box(FL_%s);\n", indent(), boxname(o->box()));
@@ -1768,5 +1766,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
}
//
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.13 2000/05/16 12:26:03 mike Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.14 2000/05/26 08:46:17 bill Exp $".
//