Committing in .

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

diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index 9d408c50f828abd4e057510f2720b2af0504ef50..3959269ab0fe25358829446ab4f049fff86ee6c5 100644 (file)
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -29,41 +29,35 @@
 #include <math.h>
 #include <string.h>
 
 #include <math.h>
 #include <string.h>
 

-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-
-#include <fstream.h>
-

 #include "wx/scrolbar.h"
 #include "wx/string.h"
 #include "wx/scrolbar.h"
 #include "wx/string.h"

+#include "wx/wfstream.h"
+#include "wx/txtstrm.h"

 
 #include "reseditr.h"
 
 char *SafeString(char *s);
 
 #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.
 
 // 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)
   if (item)

-    wxResourceManager::currentResourceManager->GetResourceAssociations().Put((long)childResource, item);
+    wxResourceManager::GetCurrentResourceManager()->GetResourceAssociations().Put((long)childResource, item);

   return 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 << "]";
 }
 
   stream << "]";
 }
 


@@ -73,27 +67,29 @@ void wxResourceTableWithSaving::OutputFont(ostream& stream, wxFont *font)
  
 bool wxResourceTableWithSaving::Save(const wxString& filename)
 {
  
 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;
     
     return FALSE;
     

+  wxTextOutputStream stream( file_output );
+    

   BeginFind();
   wxNode *node = NULL;
   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")
     {
   {
     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;
 }
 
         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());
 {
   char styleBuf[400];
   wxString itemType(item->GetType());


@@ -108,61 +104,45 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       else
       {
         stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";
       else
       {
         stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";

-        GeneratePanelStyleString(item->GetStyle(), styleBuf);
+        GenerateDialogStyleString(item->GetStyle(), styleBuf);

       }
       }

+

       stream << "  style = '" << styleBuf << "',\\\n";
       stream << "  title = '" << item->GetTitle() << "',\\\n";
       stream << "  style = '" << styleBuf << "',\\\n";
       stream << "  title = '" << item->GetTitle() << "',\\\n";

+      stream << "  id = " << item->GetId() << ",\\\n";

       stream << "  x = " << item->GetX() << ", y = " << item->GetY();
       stream << "  x = " << item->GetX() << ", y = " << item->GetY();

-      stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight() << ",\\\n";
-      stream << "  modal = " << item->GetValue1();
-      
-      if (item->GetStyle() & wxUSER_COLOURS)
+      stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight();
+
+      if (1) // item->GetStyle() & wxNO_3D)

       {
       {

-        if (item->GetBackgroundColour())
+        if (item->GetBackgroundColour().Ok())

         {
           char buf[7];
         {
           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 << "'";
         }
           buf[6] = 0;
 
           stream << ",\\\n  " << "background_colour = '" << buf << "'";
         }

-        if (item->GetLabelColour())
-        {
-          char buf[7];
-          wxDecToHex(item->GetLabelColour()->Red(), buf);
-          wxDecToHex(item->GetLabelColour()->Green(), buf+2);
-          wxDecToHex(item->GetLabelColour()->Blue(), buf+4);
-          buf[6] = 0;
+      }

 
 

-          stream << ",\\\n  " << "label_colour = '" << buf << "'";
-        }
-        if (item->GetButtonColour())
-        {
-          char buf[7];
-          wxDecToHex(item->GetButtonColour()->Red(), buf);
-          wxDecToHex(item->GetButtonColour()->Green(), buf+2);
-          wxDecToHex(item->GetButtonColour()->Blue(), buf+4);
-          buf[6] = 0;
+      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  " << "button_colour = '" << buf << "'";
-        }
-      }
+      stream << ",\\\n  " << "use_dialog_units = " << dialogUnits;
+      stream << ",\\\n  " << "use_system_defaults = " << useDefaults;

       
       

-      if (item->GetFont())
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n  font = ";
         OutputFont(stream, item->GetFont());
       }
       {
         stream << ",\\\n  font = ";
         OutputFont(stream, item->GetFont());
       }

-/*
-      if (item->GetButtonFont())
-      {
-        stream << ",\\\n  button_font = ";
-        OutputFont(stream, item->GetButtonFont());
-      }
-*/
-      
+

       if (item->GetChildren().Number() > 0)
         stream << ",\\\n";
       else
       if (item->GetChildren().Number() > 0)
         stream << ",\\\n";
       else


@@ -174,7 +154,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         
         stream << "  control = [";
         
         
         stream << "  control = [";
         

-        SaveResource(stream, child);
+        SaveResource(stream, child, item);

 
         stream << "]";
 
 
         stream << "]";
 


@@ -184,29 +164,29 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       }
       stream << ").\";\n\n";
     }
       }
       stream << ").\";\n\n";
     }

-  else if (itemType == "wxButton")
+  else if (itemType == "wxButton" || itemType == "wxBitmapButton")

     {
     {

-      GenerateButtonStyleString(item->GetStyle(), styleBuf);
-      stream << "wxButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";

-      if (item->GetFont())
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }

-  else if (itemType == "wxMessage")
+  else if (itemType == "wxStaticText" || itemType == "wxStaticBitmap")

     {
     {

-      GenerateMessageStyleString(item->GetStyle(), styleBuf);
-      stream << "wxMessage, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       if (item->GetValue4())
         stream << ", '" << item->GetValue4() << "'";

-      if (item->GetFont())
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -214,38 +194,51 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
     }
   else if (itemType == "wxCheckBox")
     {
     }
   else if (itemType == "wxCheckBox")
     {

-      GenerateCheckBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
+      stream << item->GetWidth() << ", " << item->GetHeight();
+      stream << ", " << item->GetValue1();
+      if (item->GetFont().Ok())
+      {
+        stream << ",\\\n      ";
+        OutputFont(stream, item->GetFont());
+      }
+    }
+  else if (itemType == "wxRadioButton")
+    {
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxRadioButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1();
       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());
       }
     }
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }

-  else if (itemType == "wxGroupBox")
+  else if (itemType == "wxStaticBox")

     {
     {

-      GenerateGroupBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxGroupBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxStaticBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       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());
       }
     }
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }

-  else if (itemType == "wxText" || itemType == "wxMultiText")
+  else if (itemType == "wxText" || itemType == "wxMultiText" || itemType == "wxTextCtrl")

     {
     {

-      GenerateTextStyleString(item->GetStyle(), styleBuf);
-      stream << ((itemType == "wxText") ? "wxText, " : "wxMultiText, ");
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxTextCtrl, ";

       stream << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << SafeWord(item->GetValue4());
       stream << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
       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());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -253,12 +246,12 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
     }
   else if (itemType == "wxGauge")
     {
     }
   else if (itemType == "wxGauge")
     {

-      GenerateGaugeStyleString(item->GetStyle(), styleBuf);
-      stream << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2();
       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());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -266,12 +259,12 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
     }
   else if (itemType == "wxSlider")
     {
     }
   else if (itemType == "wxSlider")
     {

-      GenerateSliderStyleString(item->GetStyle(), styleBuf);
-      stream << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3();
       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());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -279,8 +272,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
     }
   else if (itemType == "wxScrollBar")
     {
     }
   else if (itemType == "wxScrollBar")
     {

-      GenerateScrollBarStyleString(item->GetStyle(), styleBuf);
-      stream << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3() << ", ";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
       stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3() << ", ";


@@ -288,17 +281,17 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
     }
   else if (itemType == "wxListBox")
     {
     }
   else if (itemType == "wxListBox")
     {

-      GenerateListBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 
       // Default list of values
 
       stream << ", [";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 
       // 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();
         while (node)
         {
           char *s = (char *)node->Data();


@@ -308,7 +301,9 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
           node = node->Next();
         }
       }
           node = node->Next();
         }
       }

-      stream << "], ";
+      stream << "]";
+/* Styles are now in the window style, not in a separate arg
+      stream << ", ";

       switch (item->GetValue1())
       {
         case wxLB_MULTIPLE:
       switch (item->GetValue1())
       {
         case wxLB_MULTIPLE:


@@ -328,25 +323,31 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
           break;
         }
       }
           break;
         }
       }

-      if (item->GetFont())
+ */
+
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       }
     }

-  else if (itemType == "wxChoice")
+  else if (itemType == "wxChoice" || itemType == "wxComboBox")

     {
     {

-      GenerateChoiceStyleString(item->GetStyle(), styleBuf);
-      stream << "wxChoice, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 

+      if (itemType == "wxComboBox")
+        stream << ", " << SafeWord(item->GetValue4());
+

       // Default list of values
 
       stream << ", [";
       // 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();
         while (node)
         {
           char *s = (char *)node->Data();


@@ -357,7 +358,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         }
       }
       stream << "]";
         }
       }
       stream << "]";

-      if (item->GetFont())
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -366,17 +367,17 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
   else if (itemType == "wxRadioBox")
     {
       // Must write out the orientation and number of rows/cols!!
   else if (itemType == "wxRadioBox")
     {
       // Must write out the orientation and number of rows/cols!!

-      GenerateRadioBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";

       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 
       // Default list of values
 
       stream << ", [";
       stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
       stream << item->GetWidth() << ", " << item->GetHeight();
 
       // 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();
         while (node)
         {
           char *s = (char *)node->Data();


@@ -387,7 +388,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         }
       }
       stream << "], " << item->GetValue1();
         }
       }
       stream << "], " << item->GetValue1();

-      if (item->GetFont())
+      if (item->GetFont().Ok())

       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());
       {
         stream << ",\\\n      ";
         OutputFont(stream, item->GetFont());


@@ -405,7 +406,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
         
         char buf[400];
         strcpy(buf, child->GetName());
         
         char buf[400];
         strcpy(buf, child->GetName());

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

         wxDos2UnixFilename(buf);
 #endif
 
         wxDos2UnixFilename(buf);
 #endif
 


@@ -519,34 +520,22 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
       }
       stream << ").\";\n\n";
     }
       }
       stream << ").\";\n\n";
     }

+    else
+    {
+        wxString str("Unimplemented resource type: ");
+        str += itemType;
+        wxMessageBox(str);
+    }

   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxResourceTableWithSaving::GenerateWindowStyleString(long windowStyle, char *buf)
-{
-  GenerateStyle(buf, windowStyle, wxUSER_COLOURS, "wxUSER_COLOURS");
-  GenerateStyle(buf, windowStyle, wxVSCROLL, "wxVSCROLL");
-  GenerateStyle(buf, windowStyle, wxHSCROLL, "wxHSCROLL");
-  GenerateStyle(buf, windowStyle, wxBORDER, "wxBORDER");
-}
-

 void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char *buf)
 {
   buf[0] = 0;
 void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char *buf)
 {
   buf[0] = 0;

-  GenerateWindowStyleString(windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxDialog", windowStyle, buf);

 
 

-/*
-  GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
-*/
-  if (!GenerateStyle(buf, windowStyle, wxDEFAULT_DIALOG_STYLE, "wxDEFAULT_DIALOG_STYLE"))
-  {
-    GenerateStyle(buf, windowStyle, wxCAPTION, "wxCAPTION");
-    GenerateStyle(buf, windowStyle, wxTHICK_FRAME, "wxTHICK_FRAME");
-    GenerateStyle(buf, windowStyle, wxRESIZE_BORDER, "wxRESIZE_BORDER");
-    GenerateStyle(buf, windowStyle, wxSYSTEM_MENU, "wxSYSTEM_MENU");
-    GenerateStyle(buf, windowStyle, wxMINIMIZE_BOX, "wxMINIMIZE_BOX");
-    GenerateStyle(buf, windowStyle, wxMAXIMIZE_BOX, "wxMAXIMIZE_BOX");
-  }

   if (strlen(buf) == 0)
     strcat(buf, "0");
 }
   if (strlen(buf) == 0)
     strcat(buf, "0");
 }


@@ -554,152 +543,29 @@ void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char
 void wxResourceTableWithSaving::GeneratePanelStyleString(long windowStyle, char *buf)
 {
   buf[0] = 0;
 void wxResourceTableWithSaving::GeneratePanelStyleString(long windowStyle, char *buf)
 {
   buf[0] = 0;

-  GenerateWindowStyleString(windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);

 
 

-/*
-  GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
-*/

   if (strlen(buf) == 0)
     strcat(buf, "0");
 }
 
 
   if (strlen(buf) == 0)
     strcat(buf, "0");
 }
 
 

-void wxResourceTableWithSaving::GenerateItemStyleString(long windowStyle, char *buf)
-{
-  GenerateWindowStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxHORIZONTAL, "wxHORIZONTAL");
-  GenerateStyle(buf, windowStyle, wxVERTICAL, "wxVERTICAL");
-}
-
-void wxResourceTableWithSaving::GenerateRadioBoxStyleString(long windowStyle, char *buf)
+void wxResourceTableWithSaving::GenerateControlStyleString(const wxString& windowClass, long windowStyle, char *buf)

 {
   buf[0] = 0;
 {
   buf[0] = 0;

-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateMessageStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateTextStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxTE_PROCESS_ENTER, "wxTE_PROCESS_ENTER");
-  GenerateStyle(buf, windowStyle, wxTE_READONLY, "wxTE_READONLY");
-  GenerateStyle(buf, windowStyle, wxTE_PASSWORD, "wxTE_PASSWORD");
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxControl", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings(windowClass, windowStyle, buf);

 
   if (strlen(buf) == 0)
     strcat(buf, "0");
 }
 
 
   if (strlen(buf) == 0)
     strcat(buf, "0");
 }
 

-void wxResourceTableWithSaving::GenerateButtonStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateCheckBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateListBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxLB_ALWAYS_SB, "wxLB_ALWAYS_SB");
-  GenerateStyle(buf, windowStyle, wxLB_SORT,      "wxLB_SORT");
-//  GenerateStyle(buf, windowStyle, wxLB_SINGLE,    "wxLB_SINGLE"); // Done already
-  GenerateStyle(buf, windowStyle, wxLB_MULTIPLE,  "wxLB_MULTIPLE");
-  GenerateStyle(buf, windowStyle, wxLB_EXTENDED,  "wxLB_EXTENDED");
-
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateSliderStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateGroupBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateGaugeStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxGA_PROGRESSBAR, "wxGA_PROGRESSBAR");
-
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateChoiceStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateScrollBarStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-bool wxResourceTableWithSaving::GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle)
-{
-  if ((windowStyle & flag) == flag)
-  {
-    if (strlen(buf) > 0)
-      strcat(buf, " | ");
-    strcat(buf, strStyle);
-    return TRUE;
-  }
-  else
-    return FALSE;
-}
-

 // Returns quoted string or "NULL"
 // Returns quoted string or "NULL"

-char *SafeString(char *s)
+char *SafeString(const wxString& s)

 {
 {

-  if (!s)
+  if (s == "")

     return "NULL";
   else
   {
     return "NULL";
   else
   {


@@ -711,14 +577,14 @@ char *SafeString(char *s)
 }
 
 // Returns quoted string or ''
 }
 
 // Returns quoted string or ''

-char *SafeWord(char *s)
+char *SafeWord(const wxString& s)

 {
 {

-  if (!s)
+  if (s == "")

     return "''";
   else
   {
     strcpy(wxBuffer, "'");
     return "''";
   else
   {
     strcpy(wxBuffer, "'");

-    strcat(wxBuffer, s);
+    strcat(wxBuffer, (const char*) s);

     strcat(wxBuffer, "'");
     return wxBuffer;
   }
     strcat(wxBuffer, "'");
     return wxBuffer;
   }