Overwrote(!!) with source files that compile and link with latest wxGTK.

Segfaults on startup though.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 00adb89d7da377bb1b96ba20a45de989a4917e5f..984b01ba6d847f99682de8f2e338043d1bebc9f6 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -653,7 +653,7 @@ wxItemResource *wxResourceManager::FindResourceForWindow(wxWindow *win)
     wxWindow *w = (wxWindow *)node->Data();
     if (w == win)
     {
     wxWindow *w = (wxWindow *)node->Data();
     if (w == win)
     {

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

     }
   }
   return NULL;
     }
   }
   return NULL;


@@ -876,11 +876,7 @@ 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, new wxResourceTreeData(resource));
 
 
   m_editorResourceTree->SetItemData(id, new wxResourceTreeData(resource));
 

diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index 9cdde107dc5223b51a3eb6ad047d6072178f1c44..ef58aaefe6889277200e6bd63df20195a178f0a7 100644 (file)
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -32,7 +32,6 @@
 #if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #if wxUSE_IOSTREAMH
 #if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>

-#include <fstream.h>

 #else
 #include <strstream.h>
 #include <fstream.h>
 #else
 #include <strstream.h>
 #include <fstream.h>


@@ -42,6 +41,7 @@
 #include <fstream>
 #endif
 
 #include <fstream>
 #endif
 

+

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

diff --git a/utils/dialoged/src/symbtabl.cpp b/utils/dialoged/src/symbtabl.cpp
index 110764e782c97372c6630d01a9ebdb1f46e36873..b82e0ccb3742aa742f7b8ecefd573e3ca7350e51 100644 (file)
--- a/utils/dialoged/src/symbtabl.cpp
+++ b/utils/dialoged/src/symbtabl.cpp
@@ -133,7 +133,7 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
     wxNode* node = m_hashTable.Next();
     while (node)
     {

-        const char* str = node->GetKeyString();
+        char* str = node->key.string;

         int id = (int) node->Data() ;
 
         if (!IsStandardSymbol(str))
         int id = (int) node->Data() ;
 
         if (!IsStandardSymbol(str))


@@ -181,7 +181,7 @@ wxString wxResourceSymbolTable::GetSymbolForId(int id)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
     wxNode* node = m_hashTable.Next();
     while (node)
     {

-        const char* str = node->GetKeyString();
+        char* str = node->key.string;

         if (str && ( ((int) node->Data()) == id) )
             return wxString(str);
 
         if (str && ( ((int) node->Data()) == id) )
             return wxString(str);
 


@@ -323,7 +323,7 @@ bool wxResourceSymbolTable::FillComboBox(wxComboBox* comboBox)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
     wxNode* node = m_hashTable.Next();
     while (node)
     {

-        const char* str = node->GetKeyString();
+        char* str = node->key.string;

 
         comboBox->Append(str);
         node = m_hashTable.Next();
 
         comboBox->Append(str);
         node = m_hashTable.Next();

diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp
index 5be5ca236a2ce72599b8ab49a500805e38b2ec94..6b485e5a6979ab185bfd7a0410c6251c33100227 100644 (file)
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -308,7 +308,7 @@ wxProperty *wxWindowPropertyInfo::GetProperty(wxString& name)
   }
   else if (name == "height")
   {
   }
   else if (name == "height")
   {

-    return new wxProperty("height", (long)resource->GetHeight(), "integer");
+    return new wxProperty("width", (long)resource->GetHeight(), "integer");

   }
   else if (name == "id")
   {
   }
   else if (name == "id")
   {