[Wxdsgn-svn] SF.net SVN: wxdsgn: [796] branches/XRC/main.pas

[<tb...@us...>]

Revision: 796
          http://svn.sourceforge.net/wxdsgn/?rev=796&view=rev
Author:   tbreina
Date:     2006-12-31 14:35:46 -0800 (Sun, 31 Dec 2006)

Log Message:
-----------
Forgot the XRCCODE flag.
Fixed the DesignerOptions window crash (fix should also be applied to HEAD)

Modified Paths:
--------------
    branches/XRC/main.pas

Modified: branches/XRC/main.pas
===================================================================
--- branches/XRC/main.pas	2006-12-30 15:56:04 UTC (rev 795)
+++ branches/XRC/main.pas	2006-12-31 22:35:46 UTC (rev 796)
@@ -3522,7 +3522,7 @@
         wxEditor.Modified := false;
       CloseEditorInternal(wxEditor); 
 
-    wxXRCEditor := GetEditorFromFileName(ChangeFileExt(EditorFilename, XRC_EXT), true);
+    wxXRCEditor := GetEditorFromFileName(IncludeTrailingPathDelimiter(fProject.CurrentProfile.ObjectOutput) + ChangeFileExt(EditorFilename, XRC_EXT), true);
     if assigned(wxXRCEditor) then
     begin
       if Saved then
@@ -11147,11 +11147,13 @@
 begin
   with TDesignerForm.Create(Self) do
   try
-    DesignerForm.ShowModal;
-    DesignerForm.Destroy;
-  finally
+    ShowModal;
+    Destroy;
+  except
     Free;
   end;
+  XRCGEN := MainForm.ELDesigner1.GenerateXRC;
+
 end;
 
 procedure TMainForm.AlignToGridClick(Sender: TObject);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.