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
This commit is contained in:
@@ -653,7 +653,7 @@ wxItemResource *wxResourceManager::FindResourceForWindow(wxWindow *win)
|
||||
wxWindow *w = (wxWindow *)node->Data();
|
||||
if (w == win)
|
||||
{
|
||||
return (wxItemResource *)node->GetKeyInteger();
|
||||
return (wxItemResource *)node->key.integer;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
@@ -876,11 +876,7 @@ void wxResourceManager::AddItemsRecursively(long parent, wxItemResource *resourc
|
||||
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));
|
||||
|
||||
|
@@ -32,7 +32,6 @@
|
||||
#if wxUSE_IOSTREAMH
|
||||
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
|
||||
#include <strstrea.h>
|
||||
#include <fstream.h>
|
||||
#else
|
||||
#include <strstream.h>
|
||||
#include <fstream.h>
|
||||
@@ -42,6 +41,7 @@
|
||||
#include <fstream>
|
||||
#endif
|
||||
|
||||
|
||||
#include "wx/scrolbar.h"
|
||||
#include "wx/string.h"
|
||||
|
||||
|
@@ -133,7 +133,7 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
|
||||
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))
|
||||
@@ -181,7 +181,7 @@ wxString wxResourceSymbolTable::GetSymbolForId(int id)
|
||||
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);
|
||||
|
||||
@@ -323,7 +323,7 @@ bool wxResourceSymbolTable::FillComboBox(wxComboBox* comboBox)
|
||||
wxNode* node = m_hashTable.Next();
|
||||
while (node)
|
||||
{
|
||||
const char* str = node->GetKeyString();
|
||||
char* str = node->key.string;
|
||||
|
||||
comboBox->Append(str);
|
||||
node = m_hashTable.Next();
|
||||
|
@@ -308,7 +308,7 @@ wxProperty *wxWindowPropertyInfo::GetProperty(wxString& name)
|
||||
}
|
||||
else if (name == "height")
|
||||
{
|
||||
return new wxProperty("height", (long)resource->GetHeight(), "integer");
|
||||
return new wxProperty("width", (long)resource->GetHeight(), "integer");
|
||||
}
|
||||
else if (name == "id")
|
||||
{
|
||||
|
Reference in New Issue
Block a user