bug fixes

[wxWidgets.git] / utils / dialoged / src / reswrite.cpp

diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index dec8278fa800117da6cb4f0fab9b12225eed8177..ba22dfe8853ebf3ce13c5ad029a065724180580e 100644 (file)
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -29,41 +29,35 @@
 #include <math.h>
 #include <string.h>
 
-#if defined(__WXMSW__) && !defined(__GNUWIN32__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-
-#include <fstream.h>
-
 #include "wx/scrolbar.h"
 #include "wx/string.h"
+#include "wx/wfstream.h"
+#include "wx/txtstrm.h"
 
 #include "reseditr.h"
 
 char *SafeString(char *s);
-char *SafeWord(char *s);
+char *SafeWord(const wxString& s);
 
 // Save an association between the child resource and the panel item, to allow
 // us not to require unique window names.
-wxControl *wxResourceTableWithSaving::CreateItem(wxPanel *panel, wxItemResource *childResource)
+wxControl *wxResourceTableWithSaving::CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource)
 {
-  wxControl *item = wxResourceTable::CreateItem(panel, childResource);
+  wxControl *item = wxResourceTable::CreateItem(panel, childResource, parentResource);
   if (item)
     wxResourceManager::GetCurrentResourceManager()->GetResourceAssociations().Put((long)childResource, item);
   return item;
 }
 
-void wxResourceTableWithSaving::OutputFont(ostream& stream, wxFont *font)
+void wxResourceTableWithSaving::OutputFont(wxTextOutputStream& stream, const wxFont& font)
 {
-  stream << "[" << font->GetPointSize() << ", '";
-  stream << font->GetFamilyString() << "', '";
-  stream << font->GetStyleString() << "', '";
-  stream << font->GetWeightString() << "', ";
-  stream << (int)font->GetUnderlined();
-  if (font->GetFaceName() != "")
-    stream << ", '" << font->GetFaceName() << "'";
+  stream << "[" << font.GetPointSize() << ", '";
+  stream << font.GetFamilyString() << "', '";
+  stream << font.GetStyleString() << "', '";
+  stream << font.GetWeightString() << "', ";
+  stream << (int)font.GetUnderlined();
+  if (font.GetFaceName() != "")
+    stream << ", '" << font.GetFaceName() << "'";
   stream << "]";
 }
 
@@ -73,27 +67,29 @@ void wxResourceTableWithSaving::OutputFont(ostream& stream, wxFont *font)
  
 bool wxResourceTableWithSaving::Save(const wxString& filename)
 {
-  ofstream stream(((wxString &) filename).GetData());
-  if (stream.bad())
+  wxFileOutputStream file_output( filename.fn_str() );
+  if (file_output.LastError())
     return FALSE;
     
+  wxTextOutputStream stream( file_output );
+    
   BeginFind();
   wxNode *node = NULL;
-  while (node = Next())
+  while ((node = Next()))
   {
     wxItemResource *item = (wxItemResource *)node->Data();
     wxString resType(item->GetType());
     
     if (resType == "wxDialogBox" || resType == "wxDialog" || resType == "wxPanel" || resType == "wxBitmap")
     {
-      if (!SaveResource(stream, item))
+      if (!SaveResource(stream, item, (wxItemResource*) NULL))
         return FALSE;
     }
   }
   return TRUE;
 }
 
-bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *item)
+bool wxResourceTableWithSaving::SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem)
 {
   char styleBuf[400];
   wxString itemType(item->GetType());
@@ -110,27 +106,38 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";
         GenerateDialogStyleString(item->GetStyle(), styleBuf);
       }
+
       stream << "  style = '" << styleBuf << "',\\\n";
-      stream << "  title = '" << item->GetTitle() << "',\\\n";
+      stream << "  title = " << SafeWord(item->GetTitle()) << ",\\\n";
       stream << "  id = " << item->GetId() << ",\\\n";
       stream << "  x = " << item->GetX() << ", y = " << item->GetY();
       stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight();
 
       if (1) // item->GetStyle() & wxNO_3D)
       {
-        if (item->GetBackgroundColour())
+        if (item->GetBackgroundColour().Ok())
         {
           char buf[7];
-          wxDecToHex(item->GetBackgroundColour()->Red(), buf);
-          wxDecToHex(item->GetBackgroundColour()->Green(), buf+2);
-          wxDecToHex(item->GetBackgroundColour()->Blue(), buf+4);
+          wxDecToHex(item->GetBackgroundColour().Red(), buf);
+          wxDecToHex(item->GetBackgroundColour().Green(), buf+2);
+          wxDecToHex(item->GetBackgroundColour().Blue(), buf+4);
           buf[6] = 0;
 
           stream << ",\\\n  " << "background_colour = '" << buf << "'";
         }
       }
+
+      int dialogUnits = 0;
+      int useDefaults = 0;
+      if ((item->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
+        dialogUnits = 1;
+      if ((item->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
+        useDefaults = 1;
+
+      stream << ",\\\n  " << "use_dialog_units = " << dialogUnits;
+      stream << ",\\\n  " << "use_system_defaults = " << useDefaults;
       
-      if (item->GetFont() && item->GetFont()->Ok())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n  font = ";
         OutputFont(stream, item->GetFont());
@@ -147,7 +154,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         
         stream << "  control = [";
         
-        SaveResource(stream, child);
+        SaveResource(stream, child, item);
 
         stream << "]";
 
@@ -165,7 +172,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -179,7 +186,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -192,7 +199,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -205,7 +212,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -217,7 +224,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << item->GetId() << ", " << "wxStaticBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -231,7 +238,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << SafeWord(item->GetValue4());
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -244,7 +251,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -257,7 +264,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -282,9 +289,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       // Default list of values
 
       stream << ", [";
-      if (item->GetStringValues())
+      if (item->GetStringValues().Number() > 0)
       {
-        wxNode *node = item->GetStringValues()->First();
+        wxNode *node = item->GetStringValues().First();
         while (node)
         {
           char *s = (char *)node->Data();
@@ -294,7 +301,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
           node = node->Next();
         }
       }
-      stream << "], ";
+      stream << "]";
+/* Styles are now in the window style, not in a separate arg
+      stream << ", ";
       switch (item->GetValue1())
       {
         case wxLB_MULTIPLE:
@@ -314,7 +323,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
           break;
         }
       }
-      if (item->GetFont())
+ */
+
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -334,9 +345,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       // Default list of values
 
       stream << ", [";
-      if (item->GetStringValues())
+      if (item->GetStringValues().Number() > 0)
       {
-        wxNode *node = item->GetStringValues()->First();
+        wxNode *node = item->GetStringValues().First();
         while (node)
         {
           char *s = (char *)node->Data();
@@ -347,7 +358,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         }
       }
       stream << "]";
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -364,9 +375,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       // Default list of values
 
       stream << ", [";
-      if (item->GetStringValues())
+      if (item->GetStringValues().Number() > 0)
       {
-        wxNode *node = item->GetStringValues()->First();
+        wxNode *node = item->GetStringValues().First();
         while (node)
         {
           char *s = (char *)node->Data();
@@ -377,7 +388,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         }
       }
       stream << "], " << item->GetValue1();
-      if (item->GetFont())
+      if (item->GetFont().Ok())
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
@@ -552,9 +563,9 @@ void wxResourceTableWithSaving::GenerateControlStyleString(const wxString& windo
 }
 
 // Returns quoted string or "NULL"
-char *SafeString(char *s)
+char *SafeString(const wxString& s)
 {
-  if (!s)
+  if (s == "")
     return "NULL";
   else
   {
@@ -565,17 +576,35 @@ char *SafeString(char *s)
   }
 }
 
-// Returns quoted string or ''
-char *SafeWord(char *s)
+// Returns quoted string or '' : convert " to \"
+char *SafeWord(const wxString& s)
 {
-  if (!s)
-    return "''";
-  else
-  {
-    strcpy(wxBuffer, "'");
-    strcat(wxBuffer, s);
-    strcat(wxBuffer, "'");
-    return wxBuffer;
-  }
+       const char *cp;
+       char *dp;
+
+       if (s == "")
+               return "''";
+       else
+       {
+               dp = wxBuffer;
+               cp = s.c_str();
+               *dp++ = '\'';
+               while(*cp != 0) {
+                       if(*cp == '"') {
+                               *dp++ = '\\';
+                               *dp++ = '"';
+                       } else if(*cp == '\'') {
+                               *dp++ = '\\';
+                               *dp++ = '\'';
+                       } else
+                               *dp++ = *cp;
+
+                       cp++;
+               }
+               *dp++ = '\'';
+               *dp++ = 0;
+
+               return wxBuffer;
+       }
 }