mirror of https://github.com/fltk/fltk
#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.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5912 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
18dbfc8a57
commit
3c62765e3a
|
@ -337,7 +337,15 @@ void Overlay_Window::draw_overlay() {
|
|||
window->draw_overlay();
|
||||
}
|
||||
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() {
|
||||
|
@ -1375,7 +1383,7 @@ Fl_Widget_Class_Type *current_widget_class = 0;
|
|||
|
||||
Fl_Type *Fl_Widget_Class_Type::make() {
|
||||
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();
|
||||
myo->name("UserInterface");
|
||||
|
||||
|
|
|
@ -82,8 +82,8 @@ int main(int argc, char** argv) {
|
|||
|
||||
tile.end();
|
||||
window.end();
|
||||
window.show(argc,argv);
|
||||
w1.show();
|
||||
window.show(argc,argv);
|
||||
return Fl::run();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue