Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Segfaults on startup though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-12-08 10:01:55 +00:00
parent c59e2a829f
commit e47d37d087
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/dialoged/src/reseditr.cpp
View File

@@ -653,7 +653,7 @@ wxItemResource *wxResourceManager::FindResourceForWindow(wxWindow *win)
wxWindow *w = (wxWindow *)node->Data(); wxWindow *w = (wxWindow *)node->Data();
if (w == win) 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 else
imageId = 3; imageId = 3;
long id = m_editorResourceTree->InsertItem(parent, theString long id = m_editorResourceTree->AppendItem(parent, theString, imageId );
#ifdef __WXMSW__
, imageId
#endif
);
m_editorResourceTree->SetItemData(id, new wxResourceTreeData(resource)); m_editorResourceTree->SetItemData(id, new wxResourceTreeData(resource));

2
utils/dialoged/src/reswrite.cpp
View File

@@ -32,7 +32,6 @@
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__) #if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h> #include <strstrea.h>
#include <fstream.h>
#else #else
#include <strstream.h> #include <strstream.h>
#include <fstream.h> #include <fstream.h>
@@ -42,6 +41,7 @@
#include <fstream> #include <fstream>
#endif #endif
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/string.h" #include "wx/string.h"

6
utils/dialoged/src/symbtabl.cpp
View File

@@ -133,7 +133,7 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
wxNode* node = m_hashTable.Next(); wxNode* node = m_hashTable.Next();
while (node) while (node)
{ {
const char* str = node->GetKeyString(); char* str = node->key.string;
int id = (int) node->Data() ; int id = (int) node->Data() ;
if (!IsStandardSymbol(str)) if (!IsStandardSymbol(str))
@@ -181,7 +181,7 @@ wxString wxResourceSymbolTable::GetSymbolForId(int id)
wxNode* node = m_hashTable.Next(); wxNode* node = m_hashTable.Next();
while (node) while (node)
{ {
const char* str = node->GetKeyString(); char* str = node->key.string;
if (str && ( ((int) node->Data()) == id) ) if (str && ( ((int) node->Data()) == id) )
return wxString(str); return wxString(str);
@@ -323,7 +323,7 @@ bool wxResourceSymbolTable::FillComboBox(wxComboBox* comboBox)
wxNode* node = m_hashTable.Next(); wxNode* node = m_hashTable.Next();
while (node) while (node)
{ {
const char* str = node->GetKeyString(); char* str = node->key.string;
comboBox->Append(str); comboBox->Append(str);
node = m_hashTable.Next(); node = m_hashTable.Next();

2
utils/dialoged/src/winprop.cpp
View File

@@ -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")
{ {