mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1706: changed test/tile to expose issues with reversed order of 'show'. Changed Fluid to disallow a widget class inside a widget class, because Fluid has no subwindow support.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5912 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-06-18 09:35:42 +00:00
parent 18dbfc8a57
commit 3c62765e3a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fluid/Fl_Window_Type.cxx
View File

@ -337,7 +337,15 @@ void Overlay_Window::draw_overlay() {
window->draw_overlay(); window->draw_overlay();
} }
int Overlay_Window::handle(int e) { int Overlay_Window::handle(int e) {
return window->handle(e); int ret = window->handle(e);
if (ret==0) {
switch (e) {
case FL_SHOW:
case FL_HIDE:
ret = Fl_Overlay_Window::handle(e);
}
}
return ret;
} }
Fl_Type *Fl_Window_Type::make() { Fl_Type *Fl_Window_Type::make() {
@ -1375,7 +1383,7 @@ Fl_Widget_Class_Type *current_widget_class = 0;
Fl_Type *Fl_Widget_Class_Type::make() { Fl_Type *Fl_Widget_Class_Type::make() {
Fl_Type *p = Fl_Type::current; Fl_Type *p = Fl_Type::current;
while (p && !p->is_decl_block()) p = p->parent; while (p && (!p->is_decl_block() || (p->is_widget() && p->is_class()))) p = p->parent;
Fl_Widget_Class_Type *myo = new Fl_Widget_Class_Type(); Fl_Widget_Class_Type *myo = new Fl_Widget_Class_Type();
myo->name("UserInterface"); myo->name("UserInterface");

2
test/tile.cxx
View File

@ -82,8 +82,8 @@ int main(int argc, char** argv) {
tile.end(); tile.end();
window.end(); window.end();
window.show(argc,argv);
w1.show(); w1.show();
window.show(argc,argv);
return Fl::run(); return Fl::run();
} }