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

Minimal changes needed to build/run wxPython on the 2.5 branch after

Browse Source 
the merge.  Still need to look for and apply most changes and new
additions that have happened since the last merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:26:53 +00:00
parent fd657b8a59
commit dd116e73f0
22 changed files with 1923 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wxPython/src/misc2.i
View File

@@ -17,7 +17,6 @@
%{
#include "helpers.h"
#include "pyistream.h"
#include <wx/resource.h>
#include <wx/tooltip.h>
#include <wx/caret.h>
#include <wx/tipdlg.h>
@@ -34,7 +33,6 @@
#include <wx/mimetype.h>
#include <wx/snglinst.h>
#include <wx/effects.h>
//#include <wx/spawnbrowser.h>
%}
//----------------------------------------------------------------------
@@ -1251,9 +1249,9 @@ public:
%addmethods {
// Get the icon corresponding to this file type
%new wxIcon* GetIcon() {
wxIcon icon;
if (self->GetIcon(&icon))
return new wxIcon(icon);
wxIconLocation loc;
if (self->GetIcon(&loc))
return new wxIcon(loc);
else
return NULL;
}
@@ -1261,14 +1259,18 @@ public:
// Get the icon corresponding to this file type, the name of the file
// where this icon resides, and its index in this file if applicable.
PyObject* GetIconInfo() {
wxIcon icon;
wxString iconFile;
int iconIndex;
if (self->GetIcon(&icon, &iconFile, &iconIndex)) {
wxIconLocation loc;
if (self->GetIcon(&loc)) {
wxString iconFile = loc.GetFileName();
int iconIndex = -1;
#ifdef __WXMSW__
iconIndex = loc.GetIndex();
#endif
// Make a tuple and put the values in it
wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(3);
PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon),
wxT("wxIcon"), TRUE));
PyTuple_SetItem(tuple, 0,
wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), TRUE));
#if wxUSE_UNICODE
PyTuple_SetItem(tuple, 1, PyUnicode_FromWideChar(iconFile.c_str(), iconFile.Len()));
#else
@@ -1470,6 +1472,7 @@ public:
%{
#if 0
%}
// See also wxPy_ReinitStockObjects in helpers.cpp
extern wxMimeTypesManager* wxTheMimeTypesManager;
%{
#endif
@@ -1627,9 +1630,8 @@ public:
// Accessors
wxString GetHistoryFile(int i) const;
// A synonym for GetNoHistoryFiles
int GetCount() const;
int GetNoHistoryFiles() const;
%pragma(python) addtoclass = "GetNoHistoryFiles = GetCount"
};