ide (ecere)/FormDesigner: Fixed crash on dragging custom control onto…

… form (#779) - This resolves http://ecere.com/mantis/view.php?id=779
ecere · Feb 8, 2013 · 314fabd · 314fabd
1 parent 1bf187a
commit 314fabd
Showing 1 changed file with 36 additions and 29 deletions.
diff --git a/ecere/src/gui/FormDesigner.ec b/ecere/src/gui/FormDesigner.ec
@@ -583,45 +583,52 @@ class FormDesigner : ClassDesignerBase
             if(parent)
             {
                ObjectInfo object;
-               Window control = (Window)eInstance_New(eSystem_FindClass(form._class.module, objectClass));
+               Window control;
+               Class c = eSystem_FindClass(form._class.module, objectClass);
+               if(!c)
+                  c = eSystem_FindClass(form._class.module.application, objectClass);
+               if(c)
+               {
+                  control = (Window)eInstance_New(c);
 
-               activeDesigner.CodeAddObject(control, &object);
+                  activeDesigner.CodeAddObject(control, &object);
 
-               while(!parent.name) 
-               {
-                  x += parent.position.x + parent.clientStart.x;
-                  y += parent.position.y + parent.clientStart.y;
-                  parent = parent.parent;
-               }
+                  while(!parent.name) 
+                  {
+                     x += parent.position.x + parent.clientStart.x;
+                     y += parent.position.y + parent.clientStart.y;
+                     parent = parent.parent;
+                  }
 
-               control.object = object;
+                  control.object = object;
 
-               control.parent = parent;
-               control.master = form;
+                  control.parent = parent;
+                  control.master = form;
 
-               x -= x % GridSnap;
-               y -= y % GridSnap;
+                  x -= x % GridSnap;
+                  y -= y % GridSnap;
 
-               control.position.x = x;
-               control.position.y = y;
-               control.caption = object.name;
+                  control.position.x = x;
+                  control.position.y = y;
+                  control.caption = object.name;
 
-               LockControls(control, control);
+                  LockControls(control, control);
 
-               control.Create();
-               if(parent == form)
-               {  
-                  ObjectInfo previous = control.object;
-                  while((previous = previous.prev) && ((Window)previous.instance).parent != form);
-                  if(previous)
-                     control.parent.children.Move(control, (Window)previous.instance);
-               }
+                  control.Create();
+                  if(parent == form)
+                  {  
+                     ObjectInfo previous = control.object;
+                     while((previous = previous.prev) && ((Window)previous.instance).parent != form);
+                     if(previous)
+                        control.parent.children.Move(control, (Window)previous.instance);
+                  }
 
-               activeDesigner.SheetAddObject(object);
+                  activeDesigner.SheetAddObject(object);
 
-               //selected = control;
-               //activeDesigner.Update(null);
-               Update(null);
+                  //selected = control;
+                  //activeDesigner.Update(null);
+                  Update(null);
+               }
             }
          }
       }