[Wxdsgn-svn] SF.net SVN: wxdsgn: [794] branches/XRC

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

Revision: 794
          http://svn.sourceforge.net/wxdsgn/?rev=794&view=rev
Author:   tbreina
Date:     2006-12-30 07:51:55 -0800 (Sat, 30 Dec 2006)

Log Message:
-----------
XRC modifications

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

Modified: branches/XRC/Designerfrm.pas
===================================================================
--- branches/XRC/Designerfrm.pas	2006-12-30 14:18:09 UTC (rev 793)
+++ branches/XRC/Designerfrm.pas	2006-12-30 15:51:55 UTC (rev 794)
@@ -303,6 +303,12 @@
     //Form data should come first, if not the child will be resized to
     if not isSizerAvailable then
       AddClassNameGUIItemsCreation(synEdit, strClassName, intBlockStart, intBlockEnd, frmNewForm.GenerateGUIControlCreation);
+    if (XRCGEN) then //NUKLEAR ZELPH
+   begin
+    AddClassNameGUIItemsCreation(synEdit, strClassName,intBlockStart, intBlockEnd,
+    'wxXmlResource::Get()->InitAllHandlers();' + #13 +'wxXmlResource::Get()->Load("' + strClassName + '.xml");');
+   end;
+
   end;
 
   // RHS Variable
@@ -440,7 +446,7 @@
   synEdit.Lines.Add('<?xml version="1.0" encoding="ISO-8859-1"?>');
   synEdit.Lines.Add('<resource version="2.3.0.1">');
   synEdit.Lines.Add('<!-- Created by wxDev-C++ ' + DEVCPP_VERSION + ' -->');
-
+{$IFDEF XRC_ONLY_BUILD}
   synEdit.Lines.Add(Format('<object class="%s" name="%s">',
     [frmNewForm.Wx_class, frmNewForm.Wx_Name]));
   synEdit.Lines.Add(Format('<title>%s</title>', [frmNewForm.Caption]));
@@ -458,7 +464,7 @@
   else
     synEdit.Lines.Add(Format('<style>%s</style>',
       [GetStdStyleString(frmNewForm.Wx_GeneralStyle)]));
-
+{$ENDIF}
   for i := 0 to frmNewForm.ComponentCount - 1 do // Iterate
     if frmNewForm.Components[i].GetInterface(IID_IWxComponentInterface,
       wxcompInterface) then
@@ -474,8 +480,9 @@
           tempstring.Free;
         end
       end; // for
-
-  synEdit.Lines.Add('</object>');
+{$IFDEF XRC_ONLY_BUILD}
+  synEdit.Lines.Add('</object>');//NUKLEAR ZELPH
+{$ENDIF}
   synEdit.Lines.Add('</resource>');
 
 end;
@@ -605,6 +612,12 @@
             intBlockStart, intBlockEnd, strHdrValue);
         end;
       end;
+    if (XRCGEN) then //NUKLEAR ZELPH
+ begin
+  AddClassNameGUIItemsCreation(synEdit, strClassName,intBlockStart, intBlockEnd,
+    '#include <wx/xrc/xmlres.h>' + #13 + '#include <wx/xrc/xh_all.h>');
+ end;
+
     strLst.Destroy;
   end;
 
@@ -1401,7 +1414,10 @@
 
 begin
   strLst := TStringList.Create;
-
+if (XRCGEN) then //NUKLEAR ZELPH
+  begin
+    strLst.add(Format('%swxXmlResource::Get()->InitAllHandlers();%swxXmlResource::Get()->Load("%s.xml");',[#13,#13,self.Wx_Name]));
+  end;
   if self.Wx_DesignerType = dtWxFrame then
     for I := self.ComponentCount - 1 downto 0 do    // Iterate
     begin
@@ -1429,6 +1445,8 @@
                   TWxToolButton(TWinControl(Components[i]).Controls[J]).Wx_BITMAP.Bitmap.Width;
             end;
         end;    // for
+       if not (XRCGEN) then //NUKLEAR ZELPH
+	    begin 
         if not ((MaxToolWidth = 16) and (MaxToolHt = 15)) then
           strLst.add(Format('%s->SetToolBitmapSize(wxSize(%d,%d));',
             [self.Components[i].Name, MaxToolWidth, MaxToolHt]));
@@ -1439,10 +1457,14 @@
         strLst.add(Format('%s->Realize();', [self.Components[i].Name]));
         strLst.add(Format('SetToolBar(%s);', [self.Components[i].Name]));
       end;
+     end;
 
+      if not (XRCGEN) then //NUKLEAR ZELPH
+	  begin
       if IsControlWxStatusBar(TControl(Components[i])) then
         strLst.add(Format('SetStatusBar(%s);', [self.Components[i].Name]));
     end;
+   end;
 
   isSizerAvailable := False;
   for I := 0 to self.ComponentCount - 1 do // Iterate

Modified: branches/XRC/editor.pas
===================================================================
--- branches/XRC/editor.pas	2006-12-30 14:18:09 UTC (rev 793)
+++ branches/XRC/editor.pas	2006-12-30 15:51:55 UTC (rev 794)
@@ -2346,6 +2346,7 @@
     Result := Format('%.3f seconds', [(GetTickCount - StartTime) / 1000]);
   end;
 begin
+{$IFNDEF XRC_ONLY_BUILD}
   if isForm then
   begin
     StartTimeX := GetTickCount;
@@ -2392,6 +2393,7 @@
       end;
     end;
   end;
+{$ENDIF}
   if MainForm.ELDesigner1.GenerateXRC then
      UpdateXRC;
 end;

Modified: branches/XRC/main.pas
===================================================================
--- branches/XRC/main.pas	2006-12-30 14:18:09 UTC (rev 793)
+++ branches/XRC/main.pas	2006-12-30 15:51:55 UTC (rev 794)
@@ -1830,6 +1830,7 @@
 
   //Setting data for the newly created GUI
   intControlCount := 1000;
+  XRCGEN := MainForm.ELDesigner1.GenerateXRC;
 end;
 {$ENDIF}
 
@@ -3519,8 +3520,7 @@
         end
       else
         wxEditor.Modified := false;
-      CloseEditorInternal(wxEditor);
-    end;
+      CloseEditorInternal(wxEditor); 
 
     wxXRCEditor := GetEditorFromFileName(ChangeFileExt(EditorFilename, XRC_EXT), true);
     if assigned(wxXRCEditor) then
@@ -3534,6 +3534,7 @@
         wxXRCEditor.Modified:=false;
       CloseEditorInternal(wxXRCEditor);
     end;
+    end;
   end
   else
 {$ENDIF}


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