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

FLUID: Grouping and ungrouping would not work inside an Fl_Widget_Class_Type

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4553 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2005-08-30 21:25:47 +00:00
parent e3ae773842
commit aa897faeb3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fluid/Fl_Group_Type.cxx
View File

@ -34,6 +34,7 @@
#include <FL/Fl_Group.H>
#include <FL/fl_message.H>
#include "Fl_Widget_Type.h"
#include "../src/flstring.h"
// Override group's resize behavior to do nothing to children:
void igroup::resize(int X, int Y, int W, int H) {
@ -71,7 +72,7 @@ void group_cb(Fl_Widget *, void *) {
// Find the current widget:
Fl_Type *qq = Fl_Type::current;
while (qq && (!qq->is_widget() || qq->is_menu_item())) qq = qq->parent;
if (!qq || qq->level <= 1) {
if (!qq || qq->level < 1 || (qq->level == 1 && !strcmp(qq->type_name(), "widget_class"))) {
fl_message("Please select widgets to group");
return;
}
@ -95,7 +96,7 @@ void ungroup_cb(Fl_Widget *, void *) {
Fl_Type *q = Fl_Type::current;
while (q && (!q->is_widget() || q->is_menu_item())) q = q->parent;
if (q) q = q->parent;
if (!q || q->level <= 1) {
if (!q || q->level < 1 || (q->level == 1 && !strcmp(q->type_name(), "widget_class"))) {
fl_message("Please select widgets in a group");
return;
}