Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 13:26:08 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Cleanup up the demo a bit

Browse Source 
Added wxWave

Added another patch for SWIG that optimizes the generated code some
and eliminates some unused type mappings in the type registry.
(Reduces it by about half!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-18 21:59:59 +00:00
parent c20a12bd55
commit 493f1553fd
73 changed files with 3330 additions and 14483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/_extras.py
+2 -10
View File
@@ -655,17 +655,9 @@ class wxTimer(wxPyTimer):
self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
# Some wxWin methods can take "NULL" as parameters, but the shadow classes
# expect an object with the SWIG pointer as a 'this' member. This class
# and instance fools the shadow into passing the NULL pointer.
## NOTE: This is not needed anymore as None can be passed instead and
# will be interpreted as NULL.
class _NullObj:
this = 'NULL' # SWIG converts this to (void*)0
NULL = _NullObj()
NULL = None # For backwards compatibility only. You should really be
# using None now.
#----------------------------------------------------------------------
wxPython/src/helpers.cpp
+2 -2
View File
@@ -117,7 +117,7 @@ void __wxPreStart()
#ifdef WXP_WITH_THREAD
PyEval_InitThreads();
wxPyEventThreadState = PyThreadState_New(PyThreadState_Get()->interp);
wxPyEventThreadState = PyThreadState_Get(); // PyThreadState_New(PyThreadState_Get()->interp);
#endif
// Bail out if there is already windows created. This means that the
@@ -305,7 +305,7 @@ PyObject* wxPyMake_wxObject(wxObject* source) {
wxString msg("wxPython class not found for ");
msg += source->GetClassInfo()->GetClassName();
PyErr_SetString(PyExc_NameError, msg.c_str());
return NULL;
target = NULL;
}
} else { // source was NULL so return None.
Py_INCREF(Py_None); target = Py_None;
wxPython/src/misc.i
+1
View File
@@ -359,6 +359,7 @@ void wxUsleep(unsigned long milliseconds);
bool wxYield();
bool wxYieldIfNeeded();
void wxEnableTopLevelWindows(bool enable);
void wxFlushEvents();
%inline %{
char* wxGetResource(char *section, char *entry, char *file = NULL) {
wxPython/src/misc2.i
+115 -3
View File
@@ -22,9 +22,14 @@
#include <wx/fontenum.h>
#include <wx/tipdlg.h>
#include <wx/process.h>
#ifdef __WXMSW__
#if wxUSE_JOYSTICK || defined(__WXMSW__)
#include <wx/joystick.h>
#endif
#if wxUSE_WAVE || defined(__WXMSW__)
#include <wx/wave.h>
#endif
%}
//----------------------------------------------------------------------
@@ -134,6 +139,9 @@ wxWindow * wxFindWindowByName(const wxString& name, wxWindow *parent=NULL);
void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
wxWindow * wxGetActiveWindow();
wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
bool wxCheckForInterrupt(wxWindow *wnd);
//---------------------------------------------------------------------------
// Resource System
@@ -721,7 +729,66 @@ long wxExecute(const wxString& command,
//----------------------------------------------------------------------
#ifdef __WXMSW__
%{
#if !wxUSE_JOYSTICK && !defined(__WXMSW__)
// A C++ stub class for wxJoystick for platforms that don't have it.
class wxJoystick : public wxObject {
public:
wxJoystick(int joystick = wxJOYSTICK1) {
bool doSave = wxPyRestoreThread();
PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform.");
wxPySaveThread(doSave);
}
wxPoint GetPosition() { return wxPoint(-1,-1); }
int GetZPosition() { return -1; }
int GetButtonState() { return -1; }
int GetPOVPosition() { return -1; }
int GetPOVCTSPosition() { return -1; }
int GetRudderPosition() { return -1; }
int GetUPosition() { return -1; }
int GetVPosition() { return -1; }
int GetMovementThreshold() { return -1; }
void SetMovementThreshold(int threshold) ;
bool IsOk(void) { return FALSE; }
int GetNumberJoysticks() { return -1; }
int GetManufacturerId() { return -1; }
int GetProductId() { return -1; }
wxString GetProductName() { return ""; }
int GetXMin() { return -1; }
int GetYMin() { return -1; }
int GetZMin() { return -1; }
int GetXMax() { return -1; }
int GetYMax() { return -1; }
int GetZMax() { return -1; }
int GetNumberButtons() { return -1; }
int GetNumberAxes() { return -1; }
int GetMaxButtons() { return -1; }
int GetMaxAxes() { return -1; }
int GetPollingMin() { return -1; }
int GetPollingMax() { return -1; }
int GetRudderMin() { return -1; }
int GetRudderMax() { return -1; }
int GetUMin() { return -1; }
int GetUMax() { return -1; }
int GetVMin() { return -1; }
int GetVMax() { return -1; }
bool HasRudder() { return FALSE; }
bool HasZ() { return FALSE; }
bool HasU() { return FALSE; }
bool HasV() { return FALSE; }
bool HasPOV() { return FALSE; }
bool HasPOV4Dir() { return FALSE; }
bool HasPOVCTS() { return FALSE; }
bool SetCapture(wxWindow* win, int pollingFreq = 0) { return FALSE; }
bool ReleaseCapture() { return FALSE; }
};
#endif
%}
class wxJoystick : public wxObject {
public:
wxJoystick(int joystick = wxJOYSTICK1);
@@ -771,10 +838,55 @@ public:
bool SetCapture(wxWindow* win, int pollingFreq = 0);
bool ReleaseCapture();
};
#endif
//----------------------------------------------------------------------
%{
#if !wxUSE_WAVE && !defined(__WXMSW__)
// A C++ stub class for wxWave for platforms that don't have it.
class wxWave : public wxObject
{
public:
wxWave(const wxString& fileName, bool isResource = FALSE) {
bool doSave = wxPyRestoreThread();
PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
wxPySaveThread(doSave);
}
wxWave(int size, const wxByte* data) {
bool doSave = wxPyRestoreThread();
PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
wxPySaveThread(doSave);
}
~wxWave() {}
bool IsOk() const { return FALSE; }
bool Play(bool async = TRUE, bool looped = FALSE) const { return FALSE; }
};
#endif
%}
class wxWave : public wxObject
{
public:
wxWave(const wxString& fileName, bool isResource = FALSE);
~wxWave();
bool IsOk() const;
bool Play(bool async = TRUE, bool looped = FALSE) const;
};
%new wxWave* wxWaveData(const wxString& data);
%{ // Implementations of some alternate "constructors"
wxWave* wxWaveData(const wxString& data) {
return new wxWave(data.Len(), (wxByte*)data.c_str());
}
%}
//----------------------------------------------------------------------
%init %{
wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
wxPython/src/msw/calendar.cpp
+42 -288
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/clip_dnd.cpp
+85 -193
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/cmndlgs.cpp
+68 -406
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/controls.cpp
+197 -510
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/controls2.cpp
+225 -319
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/events.cpp
+207 -369
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/filesys.cpp
-168
View File
@@ -61,25 +61,6 @@ extern PyObject *SWIG_newvarlink(void);
#include <wx/fs_mem.h>
#include <wx/fs_zip.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
PyList_Append(target, o2);
Py_XDECREF(o2);
}
PyList_Append(target,o);
Py_XDECREF(o);
}
return target;
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -2205,13 +2186,7 @@ static PyMethodDef filesyscMethods[] = {
* This table is used by the pointer type-checker
*/
static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
{ "_signed_long","_long",0},
{ "_class_wxJPEGHandler","_wxJPEGHandler",0},
{ "_class_wxFSFile","_wxFSFile",0},
{ "_wxBMPHandler","_class_wxBMPHandler",0},
{ "_wxImage","_class_wxImage",0},
{ "_class_wxDateTime","_wxDateTime",0},
{ "_wxPrintQuality","_wxCoord",0},
{ "_wxPrintQuality","_int",0},
{ "_wxPrintQuality","_signed_int",0},
@@ -2221,40 +2196,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPrintQuality","_EBool",0},
{ "_wxPrintQuality","_size_t",0},
{ "_wxPrintQuality","_time_t",0},
{ "_class_wxRegionIterator","_wxRegionIterator",0},
{ "_wxGIFHandler","_class_wxGIFHandler",0},
{ "_wxInternetFSHandler","_class_wxInternetFSHandler",0},
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxImageHandler","_class_wxImageHandler",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxPNGHandler","_class_wxPNGHandler",0},
{ "_wxPen","_class_wxPen",0},
{ "_byte","_unsigned_char",0},
{ "_wxColourDatabase","_class_wxColourDatabase",0},
{ "_long","_unsigned_long",0},
{ "_long","_signed_long",0},
{ "_wxImageList","_class_wxImageList",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_class_wxObject","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_class_wxObject","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_class_wxObject","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_class_wxObject","_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_class_wxObject","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_class_wxObject","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_class_wxObject","_class_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_class_wxObject","_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_class_wxObject","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_class_wxObject","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_class_wxObject","_class_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_class_wxObject","_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_class_wxObject","_class_wxFSFile",SwigwxFSFileTowxObject},
{ "_class_wxObject","_wxFSFile",SwigwxFSFileTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_time_t",0},
@@ -2262,14 +2206,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_wxFileConfig","_class_wxFileConfig",0},
{ "_class_wxMask","_wxMask",0},
{ "_class_wxPNGHandler","_wxPNGHandler",0},
{ "_wxColour","_class_wxColour",0},
{ "_wxBrush","_class_wxBrush",0},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_time_t",0},
@@ -2278,88 +2214,35 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_int",0},
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_wxRect","_class_wxRect",0},
{ "_class_wxImage","_wxImage",0},
{ "_wxPoint","_class_wxPoint",0},
{ "_class_wxPNMHandler","_wxPNMHandler",0},
{ "_class_wxZipFSHandler","_wxZipFSHandler",0},
{ "_char","_wxChar",0},
{ "_wxBitmap","_class_wxBitmap",0},
{ "_wxPenList","_class_wxPenList",0},
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_class_wxInternetFSHandler","_wxInternetFSHandler",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_wxConfig","_class_wxConfig",0},
{ "_class_wxFileConfig","_wxFileConfig",0},
{ "_class_wxColourDatabase","_wxColourDatabase",0},
{ "_class_wxMemoryFSHandler","_wxMemoryFSHandler",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_class_wxRegion","_wxRegion",0},
{ "_wxFont","_class_wxFont",0},
{ "_wxFSFile","_class_wxFSFile",0},
{ "_unsigned_long","_long",0},
{ "_class_wxRect","_wxRect",0},
{ "_class_wxDC","_wxDC",0},
{ "_class_wxBrushList","_wxBrushList",0},
{ "_wxPyInputStream","_class_wxPyInputStream",0},
{ "_wxTimeSpan","_class_wxTimeSpan",0},
{ "_class_wxPenList","_wxPenList",0},
{ "_class_wxOutputStream","_wxOutputStream",0},
{ "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_WXTYPE","_wxDateTime_t",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
{ "_class_wxBrush","_wxBrush",0},
{ "_unsigned_short","_wxDateTime_t",0},
{ "_unsigned_short","_WXTYPE",0},
{ "_unsigned_short","_short",0},
{ "_wxDateSpan","_class_wxDateSpan",0},
{ "_class_wxFont","_wxFont",0},
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_wxFontList","_class_wxFontList",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxObject","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_wxObject","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_wxObject","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_wxObject","_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_wxObject","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_wxObject","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_wxObject","_class_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_wxObject","_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_wxObject","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_wxObject","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_wxObject","_class_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_wxObject","_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_wxObject","_class_wxFSFile",SwigwxFSFileTowxObject},
{ "_wxObject","_wxFSFile",SwigwxFSFileTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxMemoryDC","_class_wxMemoryDC",0},
{ "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
{ "_wxPaintDC","_class_wxPaintDC",0},
{ "_class_wxWindowDC","_wxWindowDC",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_class_wxImageHandler","_wxImageHandler",0},
{ "_unsigned_char","_byte",0},
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},
{ "_unsigned_int","_time_t",0},
@@ -2367,25 +2250,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_unsigned_int","_uint",0},
{ "_unsigned_int","_wxWindowID",0},
{ "_unsigned_int","_int",0},
{ "_wxIcon","_class_wxIcon",0},
{ "_wxConfigBase","_class_wxConfigBase",0},
{ "_class_wxPen","_wxPen",0},
{ "_short","_wxDateTime_t",0},
{ "_short","_WXTYPE",0},
{ "_short","_unsigned_short",0},
{ "_short","_signed_short",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_wxFileSystemHandler","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_wxZipFSHandler",SwigwxZipFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxFileSystemHandler},
{ "_wxFileSystemHandler","_class_wxFileSystemHandler",0},
{ "_wxPCXHandler","_class_wxPCXHandler",0},
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_time_t",0},
@@ -2395,7 +2267,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowID","_int",0},
{ "_wxWindowID","_signed_int",0},
{ "_wxWindowID","_unsigned_int",0},
{ "_class_wxGDIObject","_wxGDIObject",0},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_time_t",0},
@@ -2408,7 +2279,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxDateTime_t","_unsigned_short",0},
{ "_wxDateTime_t","_short",0},
{ "_wxDateTime_t","_WXTYPE",0},
{ "_wxDateTime","_class_wxDateTime",0},
{ "_time_t","_wxCoord",0},
{ "_time_t","_wxPrintQuality",0},
{ "_time_t","_unsigned_int",0},
@@ -2416,18 +2286,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_time_t","_wxWindowID",0},
{ "_time_t","_uint",0},
{ "_time_t","_size_t",0},
{ "_wxZipFSHandler","_class_wxZipFSHandler",0},
{ "_class_wxTimeSpan","_wxTimeSpan",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_class_wxIcon","_wxIcon",0},
{ "_class_wxColour","_wxColour",0},
{ "_class_wxScreenDC","_wxScreenDC",0},
{ "_class_wxConfigBase","_wxConfigBase",0},
{ "_wxPalette","_class_wxPalette",0},
{ "_wxCoord","_int",0},
{ "_wxCoord","_signed_int",0},
{ "_wxCoord","_unsigned_int",0},
@@ -2437,32 +2295,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCoord","_size_t",0},
{ "_wxCoord","_time_t",0},
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxMemoryFSHandler","_class_wxMemoryFSHandler",0},
{ "_class_wxDateSpan","_wxDateSpan",0},
{ "_wxRegion","_class_wxRegion",0},
{ "_wxFileSystem","_class_wxFileSystem",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxTIFFHandler","_class_wxTIFFHandler",0},
{ "_class_wxBusyInfo","_wxBusyInfo",0},
{ "_class_wxFontList","_wxFontList",0},
{ "_class_wxClientDC","_wxClientDC",0},
{ "_wxBrushList","_class_wxBrushList",0},
{ "_class_wxSize","_wxSize",0},
{ "_class_wxBitmap","_wxBitmap",0},
{ "_class_wxMemoryDC","_wxMemoryDC",0},
{ "_wxOutputStream","_class_wxOutputStream",0},
{ "_class_wxConfig","_wxConfig",0},
{ "_class_wxPalette","_wxPalette",0},
{ "_class_wxFileSystemHandler","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_wxZipFSHandler",SwigwxZipFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxFileSystemHandler},
{ "_class_wxFileSystemHandler","_wxFileSystemHandler",0},
{ "_class_wxFileSystem","_wxFileSystem",0},
{0,0,0}};
static PyObject *SWIG_globals;
wxPython/src/msw/frames.cpp
+28 -284
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/gdi.cpp
+280 -198
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/grid.cpp
+361 -413
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/html.cpp
-567
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/htmlhelp.cpp
-513
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/image.cpp
+58 -153
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/mdi.cpp
+17 -302
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/misc.cpp
+151 -51
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/misc.py
+2
View File
@@ -587,6 +587,8 @@ wxYieldIfNeeded = miscc.wxYieldIfNeeded
wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
wxFlushEvents = miscc.wxFlushEvents
wxGetResource = miscc.wxGetResource
wxStripMenuCodes = miscc.wxStripMenuCodes
wxPython/src/msw/misc2.cpp
+371 -289
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/misc2.py
+38
View File
@@ -626,6 +626,29 @@ class wxJoystick(wxJoystickPtr):
class wxWavePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,misc2c=misc2c):
if self.thisown == 1 :
misc2c.delete_wxWave(self)
def IsOk(self, *_args, **_kwargs):
val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
return val
def Play(self, *_args, **_kwargs):
val = apply(misc2c.wxWave_Play,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxWave instance at %s>" % (self.this,)
class wxWave(wxWavePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(misc2c.new_wxWave,_args,_kwargs)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
@@ -687,6 +710,16 @@ def wxGetActiveWindow(*_args, **_kwargs):
val = apply(misc2c.wxGetActiveWindow,_args,_kwargs)
return val
def wxGenericFindWindowAtPoint(*_args, **_kwargs):
val = apply(misc2c.wxGenericFindWindowAtPoint,_args,_kwargs)
return val
def wxFindWindowAtPoint(*_args, **_kwargs):
val = apply(misc2c.wxFindWindowAtPoint,_args,_kwargs)
return val
wxCheckForInterrupt = misc2c.wxCheckForInterrupt
wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
wxResourceClear = misc2c.wxResourceClear
@@ -798,6 +831,11 @@ wxLogSysError = misc2c.wxLogSysError
wxExecute = misc2c.wxExecute
def wxWaveData(*_args, **_kwargs):
val = apply(misc2c.wxWaveData,_args,_kwargs)
if val: val = wxWavePtr(val); val.thisown = 1
return val
wxLog_IsEnabled = misc2c.wxLog_IsEnabled
wxLog_EnableLogging = misc2c.wxLog_EnableLogging
wxPython/src/msw/printfw.cpp
+148 -369
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/sizers.cpp
+79 -313
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/stattool.cpp
+80 -313
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/streams.cpp
-23
View File
@@ -59,25 +59,6 @@ extern PyObject *SWIG_newvarlink(void);
#include <wx/stream.h>
#include <wx/list.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
PyList_Append(target, o2);
Py_XDECREF(o2);
}
PyList_Append(target,o);
Py_XDECREF(o);
}
return target;
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -792,8 +773,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxPyInputStream","_class_wxPyInputStream",0},
{ "_class_wxOutputStream","_wxOutputStream",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
@@ -804,7 +783,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_WXTYPE","_unsigned_short",0},
{ "_unsigned_short","_WXTYPE",0},
{ "_unsigned_short","_short",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_unsigned_char","_byte",0},
@@ -852,7 +830,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCoord","_size_t",0},
{ "_wxCoord","_time_t",0},
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxOutputStream","_class_wxOutputStream",0},
{0,0,0}};
static PyObject *SWIG_globals;
wxPython/src/msw/utils.cpp
+217 -37
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/windows.cpp
+280 -216
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/windows2.cpp
+56 -307
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/windows3.cpp
+49 -336
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/wx.cpp
+7 -457
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/wx.py
+2 -10
View File
@@ -1496,17 +1496,9 @@ class wxTimer(wxPyTimer):
self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
# Some wxWin methods can take "NULL" as parameters, but the shadow classes
# expect an object with the SWIG pointer as a 'this' member. This class
# and instance fools the shadow into passing the NULL pointer.
## NOTE: This is not needed anymore as None can be passed instead and
# will be interpreted as NULL.
class _NullObj:
this = 'NULL' # SWIG converts this to (void*)0
NULL = _NullObj()
NULL = None # For backwards compatibility only. You should really be
# using None now.
#----------------------------------------------------------------------
wxPython/src/my_typemaps.i
+1
View File
@@ -18,6 +18,7 @@
wxPy_BEGIN_ALLOW_THREADS;
$function
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
}
//----------------------------------------------------------------------