Added $(OVERRIDEFLAGS) to the end of the flags so default flags can be overridden.

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

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index ebdfdc6a8aa73d70999b63f893f7658c80e07a7d..755e83b153e31d48f55597d66449d7d275ef6c9b 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -37,23 +37,28 @@
 #endif
 
 #include "wx/scrolbar.h"
 #endif
 
 #include "wx/scrolbar.h"

+#include "wx/config.h"

 
 #include <ctype.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
 
 #include <ctype.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 

+#if wxUSE_IOSTREAMH

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

+#else
+#include <strstream>
+#endif

 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 

-#ifndef __WXGTK__
+#ifdef __WXMSW__

 #include "wx/help.h"
 #endif
 
 #include "wx/help.h"
 #endif
 


@@ -70,17 +75,22 @@ wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"

-#include "bitmaps/vert.xbm"
-#include "bitmaps/alignt.xbm"
-#include "bitmaps/alignb.xbm"
-#include "bitmaps/horiz.xbm"
-#include "bitmaps/alignl.xbm"
-#include "bitmaps/alignr.xbm"
-#include "bitmaps/copysize.xbm"
-#include "bitmaps/tofront.xbm"
-#include "bitmaps/toback.xbm"
-#include "bitmaps/help.xbm"
-#include "bitmaps/wxwin.xbm"
+#include "bitmaps/vert.xpm"
+#include "bitmaps/alignt.xpm"
+#include "bitmaps/alignb.xpm"
+#include "bitmaps/horiz.xpm"
+#include "bitmaps/alignl.xpm"
+#include "bitmaps/alignr.xpm"
+#include "bitmaps/copysize.xpm"
+#include "bitmaps/tofront.xpm"
+#include "bitmaps/toback.xpm"
+#include "bitmaps/help.xpm"
+#include "bitmaps/wxwin.xpm"
+
+#include "bitmaps/dialog.xpm"
+#include "bitmaps/folder1.xpm"
+#include "bitmaps/folder2.xpm"
+#include "bitmaps/buttonsm.xpm"

 #endif
 
 /*
 #endif
 
 /*


@@ -104,8 +114,8 @@ wxResourceManager::wxResourceManager():
   m_editorToolBar = NULL;
 
   // Default window positions
   m_editorToolBar = NULL;
 
   // Default window positions

-  m_resourceEditorWindowSize.width = 470;
-  m_resourceEditorWindowSize.height = 300;
+  m_resourceEditorWindowSize.width = 500;
+  m_resourceEditorWindowSize.height = 450;

 
   m_resourceEditorWindowSize.x = 0;
   m_resourceEditorWindowSize.y = 0;
 
   m_resourceEditorWindowSize.x = 0;
   m_resourceEditorWindowSize.y = 0;


@@ -113,7 +123,7 @@ wxResourceManager::wxResourceManager():
   m_propertyWindowSize.width = 300;
   m_propertyWindowSize.height = 300;
 
   m_propertyWindowSize.width = 300;
   m_propertyWindowSize.height = 300;
 

-#ifndef __WXGTK__
+#ifdef __WXMSW__

   m_helpController = NULL;
 #endif
 
   m_helpController = NULL;
 #endif
 


@@ -126,7 +136,7 @@ wxResourceManager::~wxResourceManager()
   sm_currentResourceManager = NULL;
   SaveOptions();
 
   sm_currentResourceManager = NULL;
   SaveOptions();
 

-#ifndef __WXGTK__
+#ifdef __WXMSW__

   if (m_helpController)
   {
     m_helpController->Quit();
   if (m_helpController)
   {
     m_helpController->Quit();


@@ -149,17 +159,15 @@ bool wxResourceManager::Initialize()
   strcat(buf, "\\dialoged.ini");
   m_optionsResourceFilename = buf;
 #elif defined(__WXGTK__)
   strcat(buf, "\\dialoged.ini");
   m_optionsResourceFilename = buf;
 #elif defined(__WXGTK__)

-  char buf[500];
-  wxGetHomeDir(buf);
-  strcat(buf, "/.dialogedrc");
-  m_optionsResourceFilename = buf;
+  wxGetHomeDir( &m_optionsResourceFilename );
+  m_optionsResourceFilename += "/.dialogedrc";

 #else
 #error "Unsupported platform."
 #endif
 
   LoadOptions();
 
 #else
 #error "Unsupported platform."
 #endif
 
   LoadOptions();
 

-#ifndef __WXGTK__
+#ifdef __WXMSW__

   m_helpController = new wxHelpController;
   m_helpController->Initialize("dialoged");
 #endif
   m_helpController = new wxHelpController;
   m_helpController->Initialize("dialoged");
 #endif


@@ -174,7 +182,7 @@ bool wxResourceManager::Initialize()
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
 #ifdef __WXGTK__
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
 #ifdef __WXGTK__

-    m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
+    m_bitmapImage = new wxBitmap( wxwin_xpm );

 #endif
   }
 
 #endif
   }
 


@@ -184,11 +192,16 @@ bool wxResourceManager::Initialize()
   wxIcon icon2("FOLDER1_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
   wxIcon icon3("FOLDER2_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
   wxIcon icon4("BUTTONSM_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
   wxIcon icon2("FOLDER1_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
   wxIcon icon3("FOLDER2_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
   wxIcon icon4("BUTTONSM_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

+#else
+  wxIcon icon1( dialog_xpm );    
+  wxIcon icon2( folder1_xpm );    
+  wxIcon icon3( folder2_xpm );    
+  wxIcon icon4( buttonsm_xpm );    
+#endif

   m_imageList.Add(icon1);
   m_imageList.Add(icon2);
   m_imageList.Add(icon3);
   m_imageList.Add(icon4);
   m_imageList.Add(icon1);
   m_imageList.Add(icon2);
   m_imageList.Add(icon3);
   m_imageList.Add(icon4);

-#endif

 
   m_symbolTable.AddStandardSymbols();
 
 
   m_symbolTable.AddStandardSymbols();
 


@@ -197,6 +210,18 @@ bool wxResourceManager::Initialize()
 
 bool wxResourceManager::LoadOptions()
 {
 
 bool wxResourceManager::LoadOptions()
 {

+  wxConfig config("DialogEd", "wxWindows");
+
+  config.Read("editorWindowX", &m_resourceEditorWindowSize.x);
+  config.Read("editorWindowY", &m_resourceEditorWindowSize.y);
+  config.Read("editorWindowWidth", &m_resourceEditorWindowSize.width);
+  config.Read("editorWindowHeight", &m_resourceEditorWindowSize.height);
+  config.Read("propertyWindowX", &m_propertyWindowSize.x);
+  config.Read("propertyWindowY", &m_propertyWindowSize.y);
+  config.Read("propertyWindowWidth", &m_propertyWindowSize.width);
+  config.Read("propertyWindowHeight", &m_propertyWindowSize.height);
+
+  /*

   wxGetResource("DialogEd", "editorWindowX", &m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "editorWindowY", &m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "editorWindowWidth", &m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "editorWindowX", &m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "editorWindowY", &m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "editorWindowWidth", &m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());


@@ -205,11 +230,23 @@ bool wxResourceManager::LoadOptions()
   wxGetResource("DialogEd", "propertyWindowY", &m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "propertyWindowWidth", &m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "propertyWindowHeight", &m_propertyWindowSize.height, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "propertyWindowY", &m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "propertyWindowWidth", &m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
   wxGetResource("DialogEd", "propertyWindowHeight", &m_propertyWindowSize.height, m_optionsResourceFilename.GetData());

+  */

   return TRUE;
 }
 
 bool wxResourceManager::SaveOptions()
 {
   return TRUE;
 }
 
 bool wxResourceManager::SaveOptions()
 {

+  wxConfig config("DialogEd", "wxWindows");
+
+  config.Write("editorWindowX", m_resourceEditorWindowSize.x);
+  config.Write("editorWindowY", m_resourceEditorWindowSize.y);
+  config.Write("editorWindowWidth", m_resourceEditorWindowSize.width);
+  config.Write("editorWindowHeight", m_resourceEditorWindowSize.height);
+  config.Write("propertyWindowX", m_propertyWindowSize.x);
+  config.Write("propertyWindowY", m_propertyWindowSize.y);
+  config.Write("propertyWindowWidth", m_propertyWindowSize.width);
+  config.Write("propertyWindowHeight", m_propertyWindowSize.height);
+  /*

   wxWriteResource("DialogEd", "editorWindowX", m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "editorWindowY", m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "editorWindowWidth", m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "editorWindowX", m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "editorWindowY", m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "editorWindowWidth", m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());


@@ -219,6 +256,7 @@ bool wxResourceManager::SaveOptions()
   wxWriteResource("DialogEd", "propertyWindowY", m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "propertyWindowWidth", m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "propertyWindowHeight", m_propertyWindowSize.height, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "propertyWindowY", m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "propertyWindowWidth", m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
   wxWriteResource("DialogEd", "propertyWindowHeight", m_propertyWindowSize.height, m_optionsResourceFilename.GetData());

+  */

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -285,7 +323,7 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent)
     c->bottom.SameAs     (m_editorFrame, wxBottom, 0);
     c->width.Unconstrained();
 #ifdef __WXGTK__
     c->bottom.SameAs     (m_editorFrame, wxBottom, 0);
     c->width.Unconstrained();
 #ifdef __WXGTK__

-    c->height.Absolute(70);
+    c->height.Absolute(105);

 #else
     c->height.Absolute(60);
 #endif
 #else
     c->height.Absolute(60);
 #endif


@@ -491,7 +529,7 @@ bool wxResourceManager::DisassociateWindows()
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     DisassociateResource(res);
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     DisassociateResource(res);


@@ -517,7 +555,7 @@ void wxResourceManager::AssociateResource(wxItemResource *resource, wxWindow *wi
     else
     {
       char buf[200];
     else
     {
       char buf[200];

-      sprintf(buf, "AssociateResource: cannot find child window %s", child->GetName() ? child->GetName() : "(unnamed)");
+      sprintf(buf, "AssociateResource: cannot find child window %s", child->GetName() ? (const char*) child->GetName() : "(unnamed)");

       wxMessageBox(buf, "Dialog Editor problem", wxOK);
     }
 
       wxMessageBox(buf, "Dialog Editor problem", wxOK);
     }
 


@@ -532,18 +570,15 @@ bool wxResourceManager::DisassociateResource(wxItemResource *resource)
     return FALSE;
 
   // Disassociate children of window
     return FALSE;
 
   // Disassociate children of window

-  if (win->GetChildren())
+  wxNode *node = win->GetChildren().First();
+  while (node)

   {
   {

-    wxNode *node = win->GetChildren()->First();
-    while (node)
-    {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (child->IsKindOf(CLASSINFO(wxControl)))
-       DisassociateResource(child);
-      node = node->Next();
-    }
+    wxWindow *child = (wxWindow *)node->Data();
+    if (child->IsKindOf(CLASSINFO(wxControl)))
+           DisassociateResource(child);
+    node = node->Next();

   }
   }

-  
+

   RemoveSelection(win);
   m_resourceAssociations.Delete((long)resource);
   return TRUE;
   RemoveSelection(win);
   m_resourceAssociations.Delete((long)resource);
   return TRUE;


@@ -571,7 +606,7 @@ bool wxResourceManager::SaveInfoAndDeleteHandler(wxWindow* win)
         win->PopEventHandler();
 
         // Now reset all child event handlers
         win->PopEventHandler();
 
         // Now reset all child event handlers

-        wxNode *node = win->GetChildren()->First();
+        wxNode *node = win->GetChildren().First();

         while ( node )
         {
                wxWindow *child = (wxWindow *)node->Data();
         while ( node )
         {
                wxWindow *child = (wxWindow *)node->Data();


@@ -620,12 +655,12 @@ wxItemResource *wxResourceManager::FindResourceForWindow(wxWindow *win)
 {
   m_resourceAssociations.BeginFind();
   wxNode *node;
 {
   m_resourceAssociations.BeginFind();
   wxNode *node;

-  while (node = m_resourceAssociations.Next())
+  while ((node = m_resourceAssociations.Next()))

   {
     wxWindow *w = (wxWindow *)node->Data();
     if (w == win)
     {
   {
     wxWindow *w = (wxWindow *)node->Data();
     if (w == win)
     {

-      return (wxItemResource *)node->key.integer;
+      return (wxItemResource *)node->GetKeyInteger();

     }
   }
   return NULL;
     }
   }
   return NULL;


@@ -651,8 +686,10 @@ void wxResourceManager::MakeUniqueName(char *prefix, char *buf)
 
 wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
 {
 
 wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
 {

+  /*

   int frameWidth = 420;
   int frameHeight = 300;
   int frameWidth = 420;
   int frameHeight = 300;

+  */

   
   wxResourceEditorFrame *frame = new wxResourceEditorFrame(this, NULL, title,
     wxPoint(m_resourceEditorWindowSize.x, m_resourceEditorWindowSize.y),
   
   wxResourceEditorFrame *frame = new wxResourceEditorFrame(this, NULL, title,
     wxPoint(m_resourceEditorWindowSize.x, m_resourceEditorWindowSize.y),


@@ -663,8 +700,7 @@ wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
 
   frame->SetAutoLayout(TRUE);
 #ifdef __WXMSW__
 
   frame->SetAutoLayout(TRUE);
 #ifdef __WXMSW__

-  wxIcon *icon = new wxIcon("DIALOGEDICON");
-  frame->SetIcon(icon);
+  frame->SetIcon(wxIcon("DIALOGEDICON"));

 #endif
   return frame;
 }
 #endif
   return frame;
 }


@@ -734,16 +770,16 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
   wxBitmap ToolbarLoadBitmap( load_xpm );
   wxBitmap ToolbarSaveBitmap( save_xpm);
   wxBitmap ToolbarNewBitmap( new_xpm );
   wxBitmap ToolbarLoadBitmap( load_xpm );
   wxBitmap ToolbarSaveBitmap( save_xpm);
   wxBitmap ToolbarNewBitmap( new_xpm );

-  wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
-  wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
-  wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);
-  wxBitmap ToolbarHorizBitmap(horiz_bits, horiz_width, horiz_height);
-  wxBitmap ToolbarAlignLBitmap(alignl_bits, alignl_width, alignl_height);
-  wxBitmap ToolbarAlignRBitmap(alignr_bits, alignr_width, alignr_height);
-  wxBitmap ToolbarCopySizeBitmap(copysize_bits, copysize_width, copysize_height);
-  wxBitmap ToolbarToBackBitmap(toback_bits, toback_width, toback_height);
-  wxBitmap ToolbarToFrontBitmap(tofront_bits, tofront_width, tofront_height);
-  wxBitmap ToolbarHelpBitmap(help_bits, help_width, help_height);
+  wxBitmap ToolbarVertBitmap( vert_xpm );
+  wxBitmap ToolbarAlignTBitmap( alignt_xpm );
+  wxBitmap ToolbarAlignBBitmap( alignb_xpm );
+  wxBitmap ToolbarHorizBitmap( horiz_xpm );
+  wxBitmap ToolbarAlignLBitmap( alignl_xpm );
+  wxBitmap ToolbarAlignRBitmap( alignr_xpm );
+  wxBitmap ToolbarCopySizeBitmap( copysize_xpm );
+  wxBitmap ToolbarToBackBitmap( toback_xpm );
+  wxBitmap ToolbarToFrontBitmap( tofront_xpm );
+  wxBitmap ToolbarHelpBitmap( help_xpm );

 #endif
 
   // Create the toolbar
 #endif
 
   // Create the toolbar


@@ -761,47 +797,47 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
 #endif
   int currentX = gap;
   toolbar->AddSeparator();
 #endif
   int currentX = gap;
   toolbar->AddSeparator();

-  toolbar->AddTool(TOOLBAR_NEW, ToolbarNewBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_NEW, ToolbarNewBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "New dialog");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "New dialog");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_LOAD_FILE, ToolbarLoadBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_LOAD_FILE, ToolbarLoadBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Load");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Load");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_SAVE_FILE, ToolbarSaveBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_SAVE_FILE, ToolbarSaveBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Save");
   currentX += width + dx + gap;
   toolbar->AddSeparator();
                    FALSE, (float)currentX, -1, NULL, "Save");
   currentX += width + dx + gap;
   toolbar->AddSeparator();

-  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ, ToolbarVertBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ, ToolbarVertBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Horizontal align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Horizontal align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_FORMAT_VERT_TOP_ALIGN, ToolbarAlignTBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_VERT_TOP_ALIGN, ToolbarAlignTBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Top align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Top align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_FORMAT_VERT_BOT_ALIGN, ToolbarAlignBBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_VERT_BOT_ALIGN, ToolbarAlignBBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Bottom align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Bottom align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_FORMAT_VERT, ToolbarHorizBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_VERT, ToolbarHorizBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Vertical align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Vertical align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_LEFT_ALIGN, ToolbarAlignLBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_LEFT_ALIGN, ToolbarAlignLBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Left align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Left align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_RIGHT_ALIGN, ToolbarAlignRBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_RIGHT_ALIGN, ToolbarAlignRBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Right align");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "Right align");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_COPY_SIZE, ToolbarCopySizeBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_COPY_SIZE, ToolbarCopySizeBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Copy size");
   currentX += width + dx + gap;
   toolbar->AddSeparator();
                    FALSE, (float)currentX, -1, NULL, "Copy size");
   currentX += width + dx + gap;
   toolbar->AddSeparator();

-  toolbar->AddTool(TOOLBAR_TO_FRONT, ToolbarToFrontBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_TO_FRONT, ToolbarToFrontBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "To front");
   currentX += width + dx;
                    FALSE, (float)currentX, -1, NULL, "To front");
   currentX += width + dx;

-  toolbar->AddTool(TOOLBAR_TO_BACK, ToolbarToBackBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_TO_BACK, ToolbarToBackBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "To back");
   currentX += width + dx + gap;
 
   toolbar->AddSeparator();
                    FALSE, (float)currentX, -1, NULL, "To back");
   currentX += width + dx + gap;
 
   toolbar->AddSeparator();

-  toolbar->AddTool(TOOLBAR_HELP, ToolbarHelpBitmap, (wxBitmap *)NULL,
+  toolbar->AddTool(TOOLBAR_HELP, ToolbarHelpBitmap, wxNullBitmap,

                    FALSE, (float)currentX, -1, NULL, "Help");
   currentX += width + dx;
   
                    FALSE, (float)currentX, -1, NULL, "Help");
   currentX += width + dx;
   


@@ -818,15 +854,11 @@ void wxResourceManager::UpdateResourceList()
   m_editorResourceTree->SetInvalid(TRUE);
   m_editorResourceTree->DeleteAllItems();
 
   m_editorResourceTree->SetInvalid(TRUE);
   m_editorResourceTree->DeleteAllItems();
 

-  long id = m_editorResourceTree->InsertItem(0, "Dialogs"
-#ifdef __WXMSW__
-     , 1, 2
-#endif
-   );
+  long id = m_editorResourceTree->AddRoot("Dialogs", 1, 2);

 
   m_resourceTable.BeginFind();
   wxNode *node;
 
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());


@@ -835,7 +867,7 @@ void wxResourceManager::UpdateResourceList()
       AddItemsRecursively(id, res);
     }
   }
       AddItemsRecursively(id, res);
     }
   }

-  m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
+  m_editorResourceTree->Expand(id);

   m_editorResourceTree->SetInvalid(FALSE);
 }
 
   m_editorResourceTree->SetInvalid(FALSE);
 }
 


@@ -851,13 +883,9 @@ void wxResourceManager::AddItemsRecursively(long parent, wxItemResource *resourc
   else
     imageId = 3;
   
   else
     imageId = 3;
   

-  long id = m_editorResourceTree->InsertItem(parent, theString
-#ifdef __WXMSW__
-     , imageId
-#endif
-   );
+  long id = m_editorResourceTree->AppendItem(parent, theString, imageId );

 
 

-  m_editorResourceTree->SetItemData(id, (long) resource);
+  m_editorResourceTree->SetItemData(id, new wxResourceTreeData(resource));

 
   if (strcmp(resource->GetType(), "wxBitmap") != 0)
   {
 
   if (strcmp(resource->GetType(), "wxBitmap") != 0)
   {


@@ -869,7 +897,7 @@ void wxResourceManager::AddItemsRecursively(long parent, wxItemResource *resourc
       node = node->Next();
     }
   }
       node = node->Next();
     }
   }

-  m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
+//  m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);

 }
 
 bool wxResourceManager::EditSelectedResource()
 }
 
 bool wxResourceManager::EditSelectedResource()


@@ -877,7 +905,8 @@ bool wxResourceManager::EditSelectedResource()
   int sel = m_editorResourceTree->GetSelection();
   if (sel != 0)
   {
   int sel = m_editorResourceTree->GetSelection();
   if (sel != 0)
   {

-    wxItemResource *res = (wxItemResource *)m_editorResourceTree->GetItemData(sel);
+    wxResourceTreeData *data = (wxResourceTreeData *)m_editorResourceTree->GetItemData(sel);
+    wxItemResource *res = data->GetResource();

     return Edit(res);
   }
   return FALSE;
     return Edit(res);
   }
   return FALSE;


@@ -897,8 +926,8 @@ bool wxResourceManager::Edit(wxItemResource *res)
   }
   else
   {
   }
   else
   {

-        long style = res->GetStyle();
-        res->SetStyle(style|wxRAISED_BORDER);
+//        long style = res->GetStyle();
+//        res->SetStyle(style|wxRAISED_BORDER);

         panel = new wxPanel;
         wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
            this);
         panel = new wxPanel;
         wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
            this);


@@ -907,7 +936,7 @@ bool wxResourceManager::Edit(wxItemResource *res)
 
         panel->PushEventHandler(handler);
 
 
         panel->PushEventHandler(handler);
 

-        res->SetStyle(style);
+//        res->SetStyle(style);

                handler->AddChildHandlers(); // Add event handlers for all controls
         AssociateResource(res, panel);
 
                handler->AddChildHandlers(); // Add event handlers for all controls
         AssociateResource(res, panel);
 


@@ -933,6 +962,8 @@ bool wxResourceManager::CreateNewPanel()
   resource->SetType("wxDialog");
   resource->SetName(buf);
   resource->SetTitle(buf);
   resource->SetType("wxDialog");
   resource->SetName(buf);
   resource->SetTitle(buf);

+  resource->SetResourceStyle(wxRESOURCE_USE_DEFAULTS);
+  resource->SetResourceStyle(wxRESOURCE_DIALOG_UNITS);

 
   wxString newIdName;
   int id = GenerateWindowId("ID_DIALOG", newIdName);
 
   wxString newIdName;
   int id = GenerateWindowId("ID_DIALOG", newIdName);


@@ -943,13 +974,19 @@ bool wxResourceManager::CreateNewPanel()
 
   m_resourceTable.AddResource(resource);
 
 
   m_resourceTable.AddResource(resource);
 

+  wxSize size(400, 300);
+

   wxPanel *panel = new wxPanel(m_editorPanel, -1,
      wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),
   wxPanel *panel = new wxPanel(m_editorPanel, -1,
      wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),

-     wxSize(400, 300), wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE, buf);
+     size, wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE, buf);

   m_editorPanel->m_childWindow = panel;
 
   resource->SetStyle(panel->GetWindowStyleFlag());
   m_editorPanel->m_childWindow = panel;
 
   resource->SetStyle(panel->GetWindowStyleFlag());

-  resource->SetSize(10, 10, 400, 300);
+
+  // Store dialog units in resource
+  size = panel->ConvertPixelsToDialog(size);
+
+  resource->SetSize(10, 10, size.x, size.y);

 
   // For editing in situ we will need to use the hash table to ensure
   // we don't dereference invalid pointers.
 
   // For editing in situ we will need to use the hash table to ensure
   // we don't dereference invalid pointers.


@@ -983,7 +1020,14 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
   
   wxItemResource *res = new wxItemResource;
   wxControl *newItem = NULL;
   
   wxItemResource *res = new wxItemResource;
   wxControl *newItem = NULL;

-  res->SetSize(x, y, -1, -1);
+
+  if ((panelResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
+  {
+    wxPoint pt = panel->ConvertPixelsToDialog(wxPoint(x, y));
+    res->SetSize(pt.x, pt.y, -1, -1);
+  }
+  else res->SetSize(x, y, -1, -1);
+

   res->SetType(iType);
 
   wxString prefix;
   res->SetType(iType);
 
   wxString prefix;


@@ -996,7 +1040,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
       MakeUniqueName("button", buf);
       res->SetName(buf);
       if (isBitmap)
       MakeUniqueName("button", buf);
       res->SetName(buf);
       if (isBitmap)

-        newItem = new wxBitmapButton(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
+        newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);

       else
         newItem = new wxButton(panel, -1, "Button", wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
     }
       else
         newItem = new wxButton(panel, -1, "Button", wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
     }


@@ -1005,7 +1049,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
       prefix = "ID_BITMAPBUTTON";
       MakeUniqueName("button", buf);
       res->SetName(buf);
       prefix = "ID_BITMAPBUTTON";
       MakeUniqueName("button", buf);
       res->SetName(buf);

-      newItem = new wxBitmapButton(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
+      newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);

     }
   else if (itemType == "wxMessage" || itemType == "wxStaticText")
     {
     }
   else if (itemType == "wxMessage" || itemType == "wxStaticText")
     {


@@ -1013,7 +1057,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
       MakeUniqueName("statictext", buf);
       res->SetName(buf);
       if (isBitmap)
       MakeUniqueName("statictext", buf);
       res->SetName(buf);
       if (isBitmap)

-        newItem = new wxStaticBitmap(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(0, 0), 0, buf);
+        newItem = new wxStaticBitmap(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(0, 0), 0, buf);

       else
         newItem = new wxStaticText(panel, -1, "Static", wxPoint(x, y), wxSize(-1, -1), 0, buf);
     }
       else
         newItem = new wxStaticText(panel, -1, "Static", wxPoint(x, y), wxSize(-1, -1), 0, buf);
     }


@@ -1022,7 +1066,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
       prefix = "ID_STATICBITMAP";
       MakeUniqueName("static", buf);
       res->SetName(buf);
       prefix = "ID_STATICBITMAP";
       MakeUniqueName("static", buf);
       res->SetName(buf);

-      newItem = new wxStaticBitmap(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, buf);
+      newItem = new wxStaticBitmap(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, buf);

     }
   else if (itemType == "wxCheckBox")
     {
     }
   else if (itemType == "wxCheckBox")
     {


@@ -1046,7 +1090,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
       wxString names[] = { "One", "Two" };
       newItem = new wxRadioBox(panel, -1, "Radiobox", wxPoint(x, y), wxSize(-1, -1), 2, names, 2,
             wxHORIZONTAL, wxDefaultValidator, buf);
       wxString names[] = { "One", "Two" };
       newItem = new wxRadioBox(panel, -1, "Radiobox", wxPoint(x, y), wxSize(-1, -1), 2, names, 2,
             wxHORIZONTAL, wxDefaultValidator, buf);

-      res->SetStringValues(new wxStringList("One", "Two", NULL));
+      res->SetStringValues(wxStringList("One", "Two", NULL));

     }
   else if (itemType == "wxRadioButton")
     {
     }
   else if (itemType == "wxRadioButton")
     {


@@ -1118,6 +1162,16 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
   if (!newItem)
     return FALSE;
 
   if (!newItem)
     return FALSE;
 

+  int actualW, actualH;
+  newItem->GetSize(&actualW, &actualH);
+  wxSize actualSize(actualW, actualH);
+
+  if ((panelResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
+  {
+    actualSize = panel->ConvertPixelsToDialog(actualSize);
+  }
+  res->SetSize(res->GetX(), res->GetY(), actualSize.x, actualSize.y);
+

   wxString newIdName;
   int id = GenerateWindowId(prefix, newIdName);
   res->SetId(id);
   wxString newIdName;
   int id = GenerateWindowId(prefix, newIdName);
   res->SetId(id);


@@ -1160,16 +1214,13 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent)
     InstantiateResourceFromWindow(item, m_editorPanel->m_childWindow, TRUE);
 
     wxDialog* dialog = new wxDialog;
     InstantiateResourceFromWindow(item, m_editorPanel->m_childWindow, TRUE);
 
     wxDialog* dialog = new wxDialog;

-    long oldStyle = item->GetStyle();

     bool success = FALSE;
     bool success = FALSE;

-//    item->SetStyle(wxDEFAULT_DIALOG_STYLE);

     if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
     {
         dialog->Centre();
         dialog->ShowModal();
         success = TRUE;
     }
     if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
     {
         dialog->Centre();
         dialog->ShowModal();
         success = TRUE;
     }

-//    item->SetStyle(oldStyle);

     return success;
   }
   return FALSE;
     return success;
   }
   return FALSE;


@@ -1181,13 +1232,13 @@ wxWindow *wxResourceManager::FindParentOfSelection()
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxWindow *win = FindWindowForResource(res);
     if (win)
     {
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxWindow *win = FindWindowForResource(res);
     if (win)
     {

-      wxNode *node1 = win->GetChildren()->First();
+      wxNode *node1 = win->GetChildren().First();

       while (node1)
       {
         wxControl *item = (wxControl *)node1->Data();
       while (node1)
       {
         wxControl *item = (wxControl *)node1->Data();


@@ -1223,7 +1274,7 @@ void wxResourceManager::AlignItems(int flag)
   int centreX = (int)(firstX + (firstW / 2));
   int centreY = (int)(firstY + (firstH / 2));
 
   int centreX = (int)(firstX + (firstW / 2));
   int centreY = (int)(firstY + (firstH / 2));
 

-  while (node = node->Next())
+  while ((node = node->Next()))

   {
     wxControl *item = (wxControl *)node->Data();
     if (item->GetParent() == win)
   {
     wxControl *item = (wxControl *)node->Data();
     if (item->GetParent() == win)


@@ -1277,7 +1328,22 @@ void wxResourceManager::AlignItems(int flag)
           break;
       }
 
           break;
       }
 

+      wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
+      wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item->GetParent());
+

       item->SetSize(newX, newY, w, h);
       item->SetSize(newX, newY, w, h);

+
+         // Also update the associated resource
+         // We need to convert to dialog units if this is not a dialog or panel, but
+         // the parent resource specifies dialog units.
+         if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+      {
+        wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
+        newX = pt.x; newY = pt.y;
+        wxSize sz = item->GetParent()->ConvertPixelsToDialog(wxSize(w, h));
+        w = sz.x; h = sz.y;
+      }
+      resource->SetSize(newX, newY, w, h);

     }
   }
   win->Refresh();
     }
   }
   win->Refresh();


@@ -1302,14 +1368,28 @@ void wxResourceManager::CopySize()
   int firstW, firstH;
   firstSelection->GetPosition(&firstX, &firstY);
   firstSelection->GetSize(&firstW, &firstH);
   int firstW, firstH;
   firstSelection->GetPosition(&firstX, &firstY);
   firstSelection->GetSize(&firstW, &firstH);

-  int centreX = (int)(firstX + (firstW / 2));
-  int centreY = (int)(firstY + (firstH / 2));

 
 

-  while (node = node->Next())
+  while ((node = node->Next()))

   {
     wxControl *item = (wxControl *)node->Data();
     if (item->GetParent() == win)
   {
     wxControl *item = (wxControl *)node->Data();
     if (item->GetParent() == win)

+       {

       item->SetSize(-1, -1, firstW, firstH);
       item->SetSize(-1, -1, firstW, firstH);

+
+      wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
+      wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item->GetParent());
+
+         // Also update the associated resource
+         // We need to convert to dialog units if this is not a dialog or panel, but
+         // the parent resource specifies dialog units.
+         if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+      {
+        wxSize sz = item->GetParent()->ConvertPixelsToDialog(wxSize(firstW, firstH));
+        firstW = sz.x; firstH = sz.y;
+      }
+      resource->SetSize(resource->GetX(), resource->GetY(), firstW, firstH);
+
+       }

   }
   win->Refresh();
 }
   }
   win->Refresh();
 }


@@ -1328,18 +1408,18 @@ void wxResourceManager::ToBackOrFront(bool toBack)
     wxItemResource *itemResource = FindResourceForWindow(item);
     if (item->GetParent() == win)
     {
     wxItemResource *itemResource = FindResourceForWindow(item);
     if (item->GetParent() == win)
     {

-      win->GetChildren()->DeleteObject(item);
+      win->GetChildren().DeleteObject(item);

       if (winResource)
         winResource->GetChildren().DeleteObject(itemResource);
       if (toBack)
       {
       if (winResource)
         winResource->GetChildren().DeleteObject(itemResource);
       if (toBack)
       {

-        win->GetChildren()->Insert(item);
+        win->GetChildren().Insert(item);

         if (winResource)
           winResource->GetChildren().Insert(itemResource);
       }
       else
       {
         if (winResource)
           winResource->GetChildren().Insert(itemResource);
       }
       else
       {

-        win->GetChildren()->Append(item);
+        win->GetChildren().Append(item);

         if (winResource)
           winResource->GetChildren().Append(itemResource);
       }
         if (winResource)
           winResource->GetChildren().Append(itemResource);
       }


@@ -1366,7 +1446,7 @@ bool wxResourceManager::RemoveResourceFromParent(wxItemResource *res)
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *thisRes = (wxItemResource *)node->Data();
     if (thisRes->GetChildren().Member(res))
   {
     wxItemResource *thisRes = (wxItemResource *)node->Data();
     if (thisRes->GetChildren().Member(res))


@@ -1397,11 +1477,13 @@ bool wxResourceManager::DeleteResource(wxItemResource *res)
   // If this is a button or message resource, delete the
   // associate bitmap resource if not being used.
   wxString resType(res->GetType());
   // If this is a button or message resource, delete the
   // associate bitmap resource if not being used.
   wxString resType(res->GetType());

-  
+
+/* shouldn't have to do this now bitmaps are ref-counted

   if ((resType == "wxMessage" || resType == "wxStaticBitmap" || resType == "wxButton" || resType == "wxBitmapButton") && res->GetValue4())
   {
     PossiblyDeleteBitmapResource(res->GetValue4());
   }
   if ((resType == "wxMessage" || resType == "wxStaticBitmap" || resType == "wxButton" || resType == "wxBitmapButton") && res->GetValue4())
   {
     PossiblyDeleteBitmapResource(res->GetValue4());
   }

+*/

 
   // Remove symbol from table if appropriate
   if (!IsSymbolUsed(res, res->GetId()))
 
   // Remove symbol from table if appropriate
   if (!IsSymbolUsed(res, res->GetId()))


@@ -1427,7 +1509,9 @@ bool wxResourceManager::DeleteResource(wxWindow *win)
     {
       RemoveSelection(item);
       childHandler->SelectItem(FALSE);
     {
       RemoveSelection(item);
       childHandler->SelectItem(FALSE);

+#ifndef __WXGTK__

       item->GetParent()->Refresh();
       item->GetParent()->Refresh();

+#endif

     }
   }
   
     }
   }
   


@@ -1442,7 +1526,7 @@ bool wxResourceManager::DeleteResource(wxWindow *win)
 
 // Will eventually have bitmap type information, for different
 // kinds of bitmap.
 
 // Will eventually have bitmap type information, for different
 // kinds of bitmap.

-char *wxResourceManager::AddBitmapResource(char *filename)
+wxString wxResourceManager::AddBitmapResource(const wxString& filename)

 {
   wxItemResource *resource = FindBitmapResourceByFilename(filename);
   if (!resource)
 {
   wxItemResource *resource = FindBitmapResourceByFilename(filename);
   if (!resource)


@@ -1471,11 +1555,11 @@ char *wxResourceManager::AddBitmapResource(char *filename)
   if (resource)
     return resource->GetName();
   else
   if (resource)
     return resource->GetName();
   else

-    return NULL;
+    return wxEmptyString;

 }
 
  // Delete the bitmap resource if it isn't being used by another resource.
 }
 
  // Delete the bitmap resource if it isn't being used by another resource.

-void wxResourceManager::PossiblyDeleteBitmapResource(char *resourceName)
+void wxResourceManager::PossiblyDeleteBitmapResource(const wxString& resourceName)

 {
   if (!IsBitmapResourceUsed(resourceName))
   {
 {
   if (!IsBitmapResourceUsed(resourceName))
   {


@@ -1485,11 +1569,11 @@ void wxResourceManager::PossiblyDeleteBitmapResource(char *resourceName)
   }
 }
 
   }
 }
 

-bool wxResourceManager::IsBitmapResourceUsed(char *resourceName)
+bool wxResourceManager::IsBitmapResourceUsed(const wxString& resourceName)

 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());


@@ -1513,13 +1597,13 @@ bool wxResourceManager::IsBitmapResourceUsed(char *resourceName)
 }
 
 // Given a wxButton or wxMessage, find the corresponding bitmap filename.
 }
 
 // Given a wxButton or wxMessage, find the corresponding bitmap filename.

-char *wxResourceManager::FindBitmapFilenameForResource(wxItemResource *resource)
+wxString wxResourceManager::FindBitmapFilenameForResource(wxItemResource *resource)

 {
 {

-  if (!resource || !resource->GetValue4())
-    return NULL;
+  if (!resource || (resource->GetValue4() == ""))
+    return wxEmptyString;

   wxItemResource *bitmapResource = m_resourceTable.FindResource(resource->GetValue4());
   if (!bitmapResource)
   wxItemResource *bitmapResource = m_resourceTable.FindResource(resource->GetValue4());
   if (!bitmapResource)

-    return NULL;
+    return wxEmptyString;

 
   wxNode *node = bitmapResource->GetChildren().First();
   while (node)
 
   wxNode *node = bitmapResource->GetChildren().First();
   while (node)


@@ -1532,14 +1616,14 @@ char *wxResourceManager::FindBitmapFilenameForResource(wxItemResource *resource)
     
     node = node->Next();
   }
     
     node = node->Next();
   }

-  return NULL;
+  return wxEmptyString;

 }
 
 }
 

-wxItemResource *wxResourceManager::FindBitmapResourceByFilename(char *filename)
+wxItemResource *wxResourceManager::FindBitmapResourceByFilename(const wxString& filename)

 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());


@@ -1566,7 +1650,7 @@ bool wxResourceManager::IsSymbolUsed(wxItemResource* thisResource, wxWindowID id
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
 
   {
     wxItemResource *res = (wxItemResource *)node->Data();
 


@@ -1609,7 +1693,7 @@ void wxResourceManager::ChangeIds(int oldId, int newId)
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
 
   {
     wxItemResource *res = (wxItemResource *)node->Data();
 


@@ -1641,7 +1725,7 @@ bool wxResourceManager::RepairResourceIds()
 
   m_resourceTable.BeginFind();
   wxNode *node;
 
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());


@@ -1717,6 +1801,9 @@ wxWindow *wxResourceManager::RecreateWindowFromResource(wxWindow *win, wxWindowP
 
   wxWindow *newWin = NULL;
   wxWindow *parent = win->GetParent();
 
   wxWindow *newWin = NULL;
   wxWindow *parent = win->GetParent();

+  wxItemResource* parentResource = NULL;
+  if (parent)
+    parentResource = FindResourceForWindow(parent);

   
   if (win->IsKindOf(CLASSINFO(wxPanel)))
   {
   
   if (win->IsKindOf(CLASSINFO(wxPanel)))
   {


@@ -1730,7 +1817,7 @@ wxWindow *wxResourceManager::RecreateWindowFromResource(wxWindow *win, wxWindowP
         win->PopEventHandler(TRUE);
 
     DeleteWindow(win);
         win->PopEventHandler(TRUE);
 
     DeleteWindow(win);

-    newWin = m_resourceTable.CreateItem((wxPanel *)parent, resource);
+    newWin = m_resourceTable.CreateItem((wxPanel *)parent, resource, parentResource);

     newWin->PushEventHandler(new wxResourceEditorControlHandler((wxControl*) newWin, (wxControl*) newWin));
     AssociateResource(resource, newWin);
     UpdateResourceList();
     newWin->PushEventHandler(new wxResourceEditorControlHandler((wxControl*) newWin, (wxControl*) newWin));
     AssociateResource(resource, newWin);
     UpdateResourceList();


@@ -1751,7 +1838,8 @@ bool wxResourceManager::DeleteSelection()
   int sel = m_editorResourceTree->GetSelection();
   if (sel != 0)
   {
   int sel = m_editorResourceTree->GetSelection();
   if (sel != 0)
   {

-    wxItemResource *res = (wxItemResource *)m_editorResourceTree->GetItemData(sel);
+    wxResourceTreeData *data = (wxResourceTreeData *)m_editorResourceTree->GetItemData(sel);
+    wxItemResource *res = data->GetResource();

     wxWindow *win = FindWindowForResource(res);
     if (win)
     {
     wxWindow *win = FindWindowForResource(res);
     if (win)
     {


@@ -1786,7 +1874,7 @@ bool wxResourceManager::RecreateSelection()
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxResourceManager::EditDialog(wxDialog *dialog, wxWindow *parent)
+bool wxResourceManager::EditDialog(wxDialog *WXUNUSED(dialog), wxWindow *WXUNUSED(parent))

 {
   return FALSE;
 }
 {
   return FALSE;
 }


@@ -1797,7 +1885,7 @@ bool wxResourceManager::InstantiateAllResourcesFromWindows()
 {
   m_resourceTable.BeginFind();
   wxNode *node;
 {
   m_resourceTable.BeginFind();
   wxNode *node;

-  while (node = m_resourceTable.Next())
+  while ((node = m_resourceTable.Next()))

   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());
   {
     wxItemResource *res = (wxItemResource *)node->Data();
     wxString resType(res->GetType());


@@ -1836,7 +1924,7 @@ bool wxResourceManager::InstantiateResourceFromWindow(wxItemResource *resource,
       if (!childWindow)
       {
         char buf[200];
       if (!childWindow)
       {
         char buf[200];

-        sprintf(buf, "Could not find window %s", child->GetName());
+        sprintf(buf, "Could not find window %s", (const char*) child->GetName());

         wxMessageBox(buf, "Dialog Editor problem", wxOK);
       }
       else
         wxMessageBox(buf, "Dialog Editor problem", wxOK);
       }
       else


@@ -1884,30 +1972,30 @@ wxWindowPropertyInfo *wxResourceManager::CreatePropertyInfoForWindow(wxWindow *w
         {
           info = new wxRadioButtonPropertyInfo(win);
         }
         {
           info = new wxRadioButtonPropertyInfo(win);
         }

-  else if (win->IsKindOf(CLASSINFO(wxChoice)))
-        {
-          info = new wxChoicePropertyInfo(win);
-        }

   else if (win->IsKindOf(CLASSINFO(wxComboBox)))
         {
           info = new wxComboBoxPropertyInfo(win);
         }
   else if (win->IsKindOf(CLASSINFO(wxComboBox)))
         {
           info = new wxComboBoxPropertyInfo(win);
         }

-  else if (win->IsKindOf(CLASSINFO(wxButton)))
+  else if (win->IsKindOf(CLASSINFO(wxChoice)))

         {
         {

-          info = new wxButtonPropertyInfo(win);
+          info = new wxChoicePropertyInfo(win);

         }
   else if (win->IsKindOf(CLASSINFO(wxBitmapButton)))
         {
           info = new wxBitmapButtonPropertyInfo(win);
         }
         }
   else if (win->IsKindOf(CLASSINFO(wxBitmapButton)))
         {
           info = new wxBitmapButtonPropertyInfo(win);
         }

-  else if (win->IsKindOf(CLASSINFO(wxStaticText)))
+  else if (win->IsKindOf(CLASSINFO(wxButton)))

         {
         {

-          info = new wxStaticTextPropertyInfo(win);
+          info = new wxButtonPropertyInfo(win);

         }
   else if (win->IsKindOf(CLASSINFO(wxStaticBitmap)))
         {
           info = new wxStaticBitmapPropertyInfo(win);
         }
         }
   else if (win->IsKindOf(CLASSINFO(wxStaticBitmap)))
         {
           info = new wxStaticBitmapPropertyInfo(win);
         }

+  else if (win->IsKindOf(CLASSINFO(wxStaticText)))
+        {
+          info = new wxStaticTextPropertyInfo(win);
+        }

   else if (win->IsKindOf(CLASSINFO(wxTextCtrl)))
         {
           info = new wxTextPropertyInfo(win);
   else if (win->IsKindOf(CLASSINFO(wxTextCtrl)))
         {
           info = new wxTextPropertyInfo(win);


@@ -2029,8 +2117,8 @@ void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event))
 
 void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {

-         manager->Clear(TRUE, FALSE) ;
-      this->Close();
+      manager->Clear(TRUE, FALSE) ;
+      this->Destroy();

 }
 
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -2047,7 +2135,7 @@ void wxResourceEditorFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 
 void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))
 {

-#ifndef __WXGTK__
+#ifdef __WXMSW__

       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();


@@ -2187,17 +2275,26 @@ void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event)
  *
  */
 
  *
  */
 

+#ifdef __WXGTK__   // I don't dare to delete it...
+ 
+BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
+END_EVENT_TABLE()
+
+#else
+

 BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
        EVT_PAINT(EditorToolBar::OnPaint)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
        EVT_PAINT(EditorToolBar::OnPaint)
 END_EVENT_TABLE()
 

+#endif
+

 EditorToolBar::EditorToolBar(wxFrame *frame, const wxPoint& pos, const wxSize& size,
             long style):
   wxToolBar(frame, -1, pos, size, style)
 {
 }
 
 EditorToolBar::EditorToolBar(wxFrame *frame, const wxPoint& pos, const wxSize& size,
             long style):
   wxToolBar(frame, -1, pos, size, style)
 {
 }
 

-bool EditorToolBar::OnLeftClick(int toolIndex, bool toggled)
+bool EditorToolBar::OnLeftClick(int toolIndex, bool WXUNUSED(toggled))

 {
   wxResourceManager *manager = wxResourceManager::GetCurrentResourceManager();
 
 {
   wxResourceManager *manager = wxResourceManager::GetCurrentResourceManager();
 


@@ -2220,7 +2317,7 @@ bool EditorToolBar::OnLeftClick(int toolIndex, bool toggled)
     }
     case TOOLBAR_HELP:
     {
     }
     case TOOLBAR_HELP:
     {

-#ifndef __WXGTK__
+#ifdef __WXMSW__

       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();


@@ -2335,18 +2432,3 @@ void EditorToolBar::OnMouseEnter(int toolIndex)
   else frame->SetStatusText("");
 }
 
   else frame->SetStatusText("");
 }
 

-void EditorToolBar::OnPaint(wxPaintEvent& event)
-{
-#ifndef __WXGTK__
-  wxToolBar::OnPaint(event);
-
-  wxPaintDC dc(this);
-  int w, h;
-  GetSize(&w, &h);
-  dc.SetPen(wxBLACK_PEN);
-  dc.SetBrush(wxTRANSPARENT_BRUSH);
-  dc.DrawLine(0, h-1, w, h-1);
-#endif
-}
-
-