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

Gobs of changes needed to get up to date with today's CVS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-31 00:57:21 +00:00
parent bb9e79c05e
commit 8f514ab459
57 changed files with 5361 additions and 1497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/docs/CHANGES.txt
+24
View File
@@ -2,6 +2,30 @@ Recent Changes for wxPython
=====================================================================
2.7.2.0
-------
*
Patch [ 1583183 ] Fixes printing/print preview inconsistencies
Add events API to wxHtmlWindow (patch #1504493 by Francesco Montorsi)
Added wxTB_RIGHT style for right-aligned toolbars (Igor Korot)
Added New Zealand NZST and NZDT timezone support to wx.DateTime.
wx.Window.GetAdjustedBestSize is deprecated. In every conceivable
scenario GetBestFitting size is probably what you want to use instead.
2.7.1.3
-------
* 26-Oct-2006
wxPython/include/wx/wxPython/wxPython_int.h
+23
View File
@@ -910,6 +910,29 @@ extern wxPyApp *wxPythonApp;
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK_INT_WIN(CBNAME) \
int CBNAME(wxWindow* a)
#define IMP_PYCALLBACK_INT_WIN(CLASS, PCLASS, CBNAME) \
int CLASS::CBNAME(wxWindow* a) { \
int rval=0; \
bool found; \
wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a, false); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)",obj)); \
Py_DECREF(obj); \
} \
wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK__DC(CBNAME) \
wxPython/src/_bitmap.i
+92 -23
View File
@@ -23,6 +23,22 @@
//---------------------------------------------------------------------------
%{
// See http://tinyurl.com/e5adr for what premultiplying alpha means. It
// appears to me that the other platforms are already doing it, so I'll just
// automatically do it for wxMSW here.
#ifdef __WXMSW__
#define wxPy_premultiply(p, a) ((p) * (a) / 0xff)
#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p))
#else
#define wxPy_premultiply(p, a) (p)
#define wxPy_unpremultiply(p, a) (p)
#endif
%}
//---------------------------------------------------------------------------
%{
#include <wx/image.h>
@@ -298,21 +314,87 @@ the ``type`` parameter.", "");
#ifdef __WXMSW__
bool CopyFromCursor(const wxCursor& cursor);
// WXWIN_COMPATIBILITY_2_4
#if 0
int GetQuality();
void SetQuality(int q);
%pythoncode { GetQuality = wx._deprecated(GetQuality) }
%pythoncode { SetQuality = wx._deprecated(SetQuality) }
#endif
#endif
%extend {
DocStr(CopyFromBuffer,
"Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more details.", "");
void CopyFromBuffer(buffer data, int DATASIZE)
{
int height=self->GetHeight();
int width=self->GetWidth();
if (DATASIZE != width * height * 3) {
wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
}
wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
if (! pixData) {
// raise an exception...
wxPyErr_SetString(PyExc_RuntimeError,
"Failed to gain raw access to bitmap data.");
return;
}
wxNativePixelData::Iterator p(pixData);
for (int y=0; y<height; y++) {
wxNativePixelData::Iterator rowStart = p;
for (int x=0; x<width; x++) {
p.Red() = *(data++);
p.Green() = *(data++);
p.Blue() = *(data++);
++p;
}
p = rowStart;
p.OffsetY(pixData, 1);
}
}
DocStr(CopyFromBufferRGBA,
"Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more details.", "");
void CopyFromBufferRGBA(buffer data, int DATASIZE)
{
int height=self->GetHeight();
int width=self->GetWidth();
if (DATASIZE != width * height * 4) {
wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
}
wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
if (! pixData) {
// raise an exception...
wxPyErr_SetString(PyExc_RuntimeError,
"Failed to gain raw access to bitmap data.");
return;
}
pixData.UseAlpha();
wxAlphaPixelData::Iterator p(pixData);
for (int y=0; y<height; y++) {
wxAlphaPixelData::Iterator rowStart = p;
for (int x=0; x<width; x++) {
byte a = data[3];
p.Red() = wxPy_premultiply(*(data++), a);
p.Green() = wxPy_premultiply(*(data++), a);
p.Blue() = wxPy_premultiply(*(data++), a);
p.Alpha() = a; data++;
++p;
}
p = rowStart;
p.OffsetY(pixData, 1);
}
}
}
%pythoncode { def __nonzero__(self): return self.IsOk() }
// TODO: Should these just be removed since the C++ operators are
// gone? Or is using IsSameAs for wxPython ok?
%extend {
bool __eq__(const wxBitmap* other) { return other ? (*self == *other) : false; }
bool __ne__(const wxBitmap* other) { return other ? (*self != *other) : true; }
bool __eq__(const wxBitmap* other) { return other ? self->IsSameAs(*other) : false; }
bool __ne__(const wxBitmap* other) { return other ? !self->IsSameAs(*other) : true; }
}
%property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`");
@@ -331,19 +413,6 @@ the ``type`` parameter.", "");
// use the Abstract Pixel API to be able to set RGB and A bytes directly into
// the wxBitmap's pixel buffer.
%{
// See http://tinyurl.com/e5adr for what premultiplying alpha means. It
// appears to me that the other platforms are already doing it, so I'll just
// automatically do it for wxMSW here.
#ifdef __WXMSW__
#define wxPy_premultiply(p, a) ((p) * (a) / 0xff)
#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p))
#else
#define wxPy_premultiply(p, a) (p)
#define wxPy_unpremultiply(p, a) (p)
#endif
%}
%newobject _BitmapFromBufferAlpha;
%newobject _BitmapFromBuffer;
wxPython/src/_datetime.i
+6 -2
View File
@@ -78,7 +78,7 @@ public:
GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
GMT0,
GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,
// Europe
WET = GMT0, // Western Europe Time
@@ -108,10 +108,14 @@ public:
// Australia
A_WST = GMT8, // Western Standard Time
A_CST = GMT12 + 1, // Central Standard Time (+9.5)
A_CST = GMT13 + 1, // Central Standard Time (+9.5)
A_EST = GMT10, // Eastern Standard Time
A_ESST = GMT11, // Eastern Summer Time
// New Zealand
NZST = GMT12, // Standard Time
NZDT = GMT13, // Daylight Saving Time
// Universal Coordinated Time = the new and politically correct name
// for GMT
UTC = GMT0
wxPython/src/_dc.i
+14 -2
View File
@@ -352,6 +352,12 @@ position.", "
:param srcPtMask: Source position on the mask.
",
BlitPointSize);
DocDeclStr(
wxBitmap , GetAsBitmap(const wxRect *subrect = NULL) const,
"", "");
DocStr(
@@ -1316,7 +1322,7 @@ of it) before a bitmap can be reselected into another memory DC.
class wxMemoryDC : public wxDC {
public:
DocCtorStr(
wxMemoryDC(const wxBitmap& bitmap = wxNullBitmap),
wxMemoryDC(wxBitmap& bitmap = wxNullBitmap),
"Constructs a new memory device context.
Use the Ok member to test whether the constructor was successful in
@@ -1333,7 +1339,7 @@ drawing on it.", "
DocDeclStr(
void , SelectObject(const wxBitmap& bitmap),
void , SelectObject(wxBitmap& bitmap),
"Selects the bitmap into the device context, to use as the memory
bitmap. Selecting the bitmap into a memory DC allows you to draw into
the DC, and therefore the bitmap, and also to use Blit to copy the
@@ -1343,6 +1349,12 @@ If the argument is wx.NullBitmap (or some other uninitialised
`wx.Bitmap`) the current bitmap is selected out of the device context,
and the original bitmap restored, allowing the current bitmap to be
destroyed safely.", "");
DocDeclStr(
void , SelectObjectAsSource(const wxBitmap& bmp),
"", "");
};
wxPython/src/_gdicmn.i
+1
View File
@@ -42,6 +42,7 @@ enum wxBitmapType
wxBITMAP_TYPE_ICON,
wxBITMAP_TYPE_ANI,
wxBITMAP_TYPE_IFF,
wxBITMAP_TYPE_TGA,
wxBITMAP_TYPE_MACCURSOR,
// wxBITMAP_TYPE_BMP_RESOURCE,
wxPython/src/_graphics.i
+3 -4
View File
@@ -364,8 +364,7 @@ public :
class wxGraphicsMatrix : public wxGraphicsObject
{
public :
// wxGraphicsMatrix(wxGraphicsRenderer* renderer); *** This class is an ABC
wxGraphicsMatrix();
virtual ~wxGraphicsMatrix();
DocDeclStr(
@@ -439,7 +438,7 @@ public :
class wxGraphicsPath : public wxGraphicsObject
{
public :
//wxGraphicsPath(wxGraphicsRenderer* renderer); *** This class is an ABC, so we can't allow instances to be created directly
wxGraphicsPath();
virtual ~wxGraphicsPath();
@@ -570,7 +569,7 @@ const wxGraphicsPath wxNullGraphicsPath;
class wxGraphicsContext : public wxGraphicsObject
{
public:
// wxGraphicsContext() This is also an ABC, use Create to make an instance...
// wxGraphicsContext() This is an ABC, use Create to make an instance...
virtual ~wxGraphicsContext();
%newobject Create;
wxPython/src/_image.i
+21 -1
View File
@@ -1263,7 +1263,12 @@ public:
};
#if wxUSE_IFF
#if 0
%{
#include <wx/imagiff.h>
%}
DocStr(wxIFFHandler,
"A `wx.ImageHandler` for IFF image files.", "");
class wxIFFHandler : public wxImageHandler {
@@ -1272,6 +1277,21 @@ public:
};
#endif
#if 0
%{
#include <wx/imagtga.h>
%}
DocStr(wxTGAHandler,
"A `wx.ImageHandler` for TGA image files.", "");
class wxTGAHandler : public wxImageHandler {
public:
wxTGAHandler();
};
#endif
//---------------------------------------------------------------------------
%{
wxPython/src/_obj.i
+7
View File
@@ -38,6 +38,13 @@ public:
}
}
DocDeclStr(
bool , IsSameAs(const wxObject& p) const,
"For wx.Objects that use C++ reference counting internally, this method
can be used to determine if two objects are referencing the same data
object.", "");
%property(ClassName, GetClassName, doc="See `GetClassName`");
};
wxPython/src/_printfw.i
+3 -1
View File
@@ -82,6 +82,7 @@ public:
int GetQuality();
wxPrintBin GetBin();
wxPrintMode GetPrintMode() const;
int GetMedia() const;
void SetNoCopies(int v);
void SetCollate(bool flag);
@@ -95,7 +96,8 @@ public:
void SetQuality(int quality);
void SetBin(wxPrintBin bin);
void SetPrintMode(wxPrintMode printMode);
void SetMedia(int media);
wxString GetFilename() const;
void SetFilename( const wxString &filename );
wxPython/src/_process.i
+8
View File
@@ -101,6 +101,14 @@ public:
%pythonAppend wxPyProcess "self._setCallbackInfo(self, Process)"
wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
~wxPyProcess();
DocDeclStr(
long , GetPid() const,
"get the process ID of the process executed by Open()", "");
void _setCallbackInfo(PyObject* self, PyObject* _class);
wxPython/src/_toolbar.i
+6 -2
View File
@@ -34,6 +34,11 @@ enum wxToolBarToolStyle
enum {
wxTB_HORIZONTAL,
wxTB_VERTICAL,
wxTB_TOP,
wxTB_LEFT,
wxTB_BOTTOM,
wxTB_RIGHT,
wxTB_3DBUTTONS,
wxTB_FLAT,
wxTB_DOCKABLE,
@@ -43,8 +48,7 @@ enum {
wxTB_NOALIGN,
wxTB_HORZ_LAYOUT,
wxTB_HORZ_TEXT,
wxTB_NO_TOOLTIPS,
wxTB_BOTTOM
wxTB_NO_TOOLTIPS
};
wxPython/src/_window.i
+9 -11
View File
@@ -578,18 +578,16 @@ the results.
", "");
DocDeclStr(
wxSize , GetAdjustedBestSize() const,
"This method is similar to GetBestSize, except in one
thing. GetBestSize should return the minimum untruncated size of the
window, while this method will return the largest of BestSize and any
user specified minimum size. ie. it is the minimum size the window
should currently be drawn at, not the minimal size it can possibly
tolerate.", "");
%pythoncode {
def GetAdjustedBestSize(self):
s = self.GetBestSize()
return wx.Size(max(s.width, self.GetMinWidth()),
max(s.height, self.GetMinHeight()))
GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')
}
DocDeclStr(
void , Center( int direction = wxBOTH ),
"Centers the window. The parameter specifies the direction for
@@ -670,12 +668,12 @@ the virtual area of the window outside the given bounds.", "");
"", "");
DocDeclStr(
void , SetMinSize(const wxSize& minSize),
virtual void , SetMinSize(const wxSize& minSize),
"A more convenient method than `SetSizeHints` for setting just the
min size.", "");
DocDeclStr(
void , SetMaxSize(const wxSize& maxSize),
virtual void , SetMaxSize(const wxSize& maxSize),
"A more convenient method than `SetSizeHints` for setting just the
max size.", "");
wxPython/src/aui.i
+88 -1
View File
@@ -289,6 +289,7 @@ class wxPyDockArt : public wxDefaultDockArt
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
odc, owin, orientation, orect));
Py_DECREF(odc);
Py_DECREF(owin);
Py_DECREF(orect);
}
wxPyEndBlockThreads(blocked);
@@ -310,6 +311,7 @@ class wxPyDockArt : public wxDefaultDockArt
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
odc, owin, orientation, orect));
Py_DECREF(odc);
Py_DECREF(owin);
Py_DECREF(orect);
}
wxPyEndBlockThreads(blocked);
@@ -334,6 +336,7 @@ class wxPyDockArt : public wxDefaultDockArt
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
odc, owin, otext, orect, opane));
Py_DECREF(odc);
Py_DECREF(owin);
Py_DECREF(otext);
Py_DECREF(orect);
Py_DECREF(opane);
@@ -379,6 +382,7 @@ class wxPyDockArt : public wxDefaultDockArt
PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
Py_DECREF(odc);
Py_DECREF(owin);
Py_DECREF(orect);
Py_DECREF(opane);
}
@@ -405,6 +409,7 @@ class wxPyDockArt : public wxDefaultDockArt
odc, owin, button, button_state,
orect, opane));
Py_DECREF(odc);
Py_DECREF(owin);
Py_DECREF(orect);
Py_DECREF(opane);
}
@@ -484,6 +489,7 @@ class wxPyTabArt : public wxDefaultTabArt
{
wxPyTabArt() : wxDefaultTabArt() {}
virtual void DrawBackground( wxDC* dc,
const wxRect& rect )
{
@@ -547,9 +553,90 @@ class wxPyTabArt : public wxDefaultTabArt
}
virtual void DrawButton( wxDC* dc,
const wxRect& in_rect,
int bitmap_id,
int button_state,
int orientation,
const wxBitmap& bitmap_override,
wxRect* out_rect)
{
bool found;
const char* errmsg = "DrawButton should return a wxRect";
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) {
PyObject* odc = wxPyMake_wxObject(dc, false);
PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
PyObject* ro;
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
bitmap_id, button_state, orientation,
obmp));
if (ro) {
if (!wxRect_helper(ro, &out_rect))
PyErr_SetString(PyExc_TypeError, errmsg);
Py_DECREF(ro);
}
Py_DECREF(odc);
Py_DECREF(orect);
Py_DECREF(obmp);
}
wxPyEndBlockThreads(blocked);
if (!found)
wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
}
virtual wxSize GetTabSize( wxDC* dc,
const wxString& caption,
bool active,
int* x_extent)
{
bool found;
wxSize rv, *prv = &rv;
const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)";
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) {
PyObject* odc = wxPyMake_wxObject(dc, false);
PyObject* otext = wx2PyString(caption);
PyObject* ro;
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
if (ro) {
if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
PyObject* o1 = PySequence_GetItem(ro, 0);
PyObject* o2 = PySequence_GetItem(ro, 1);
if (!wxSize_helper(o1, &prv))
PyErr_SetString(PyExc_TypeError, errmsg);
else if (!PyInt_Check(o2))
PyErr_SetString(PyExc_TypeError, errmsg);
else
*x_extent = PyInt_AsLong(o2);
Py_DECREF(o1);
Py_DECREF(o2);
}
else {
PyErr_SetString(PyExc_TypeError, errmsg);
}
Py_DECREF(ro);
}
Py_DECREF(odc);
Py_DECREF(otext);
}
wxPyEndBlockThreads(blocked);
if (!found)
rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
return rv;
}
DEC_PYCALLBACK__FONT(SetNormalFont);
DEC_PYCALLBACK__FONT(SetSelectedFont);
DEC_PYCALLBACK__FONT(SetMeasuringFont);
DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
PYPRIVATE;
};
@@ -558,7 +645,7 @@ class wxPyTabArt : public wxDefaultTabArt
IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);
%}
wxPython/src/gtk/_controls.py
+4 -1
View File
@@ -3471,6 +3471,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
TB_HORIZONTAL = _controls_.TB_HORIZONTAL
TB_VERTICAL = _controls_.TB_VERTICAL
TB_TOP = _controls_.TB_TOP
TB_LEFT = _controls_.TB_LEFT
TB_BOTTOM = _controls_.TB_BOTTOM
TB_RIGHT = _controls_.TB_RIGHT
TB_3DBUTTONS = _controls_.TB_3DBUTTONS
TB_FLAT = _controls_.TB_FLAT
TB_DOCKABLE = _controls_.TB_DOCKABLE
@@ -3481,7 +3485,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
TB_BOTTOM = _controls_.TB_BOTTOM
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
wxPython/src/gtk/_controls_wrap.cpp
+4 -1
View File
@@ -49044,6 +49044,10 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));
SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
@@ -49054,7 +49058,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
wxPython/src/gtk/_core.py
+16 -12
View File
@@ -708,6 +708,16 @@ class Object(object):
args[0].this.own(False)
return _core_.Object_Destroy(*args, **kwargs)
def IsSameAs(*args, **kwargs):
"""
IsSameAs(self, Object p) -> bool
For wx.Objects that use C++ reference counting internally, this method
can be used to determine if two objects are referencing the same data
object.
"""
return _core_.Object_IsSameAs(*args, **kwargs)
ClassName = property(GetClassName,doc="See `GetClassName`")
_core_.Object_swigregister(Object)
_wxPySetDictionary = _core_._wxPySetDictionary
@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA
BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
CURSOR_NONE = _core_.CURSOR_NONE
@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
"""
return _core_.Window_GetBestFittingSize(*args, **kwargs)
def GetAdjustedBestSize(*args, **kwargs):
"""
GetAdjustedBestSize(self) -> Size
This method is similar to GetBestSize, except in one
thing. GetBestSize should return the minimum untruncated size of the
window, while this method will return the largest of BestSize and any
user specified minimum size. ie. it is the minimum size the window
should currently be drawn at, not the minimal size it can possibly
tolerate.
"""
return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
def GetAdjustedBestSize(self):
s = self.GetBestSize()
return wx.Size(max(s.width, self.GetMinWidth()),
max(s.height, self.GetMinHeight()))
GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')
def Center(*args, **kwargs):
"""
wxPython/src/gtk/_core_wrap.cpp
+46 -29
View File
@@ -4511,6 +4511,50 @@ fail:
}
SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxObject *arg1 = (wxObject *) 0 ;
wxObject *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "p", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'");
}
arg1 = reinterpret_cast< wxObject * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
arg2 = reinterpret_cast< wxObject * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -34631,34 +34675,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
wxSize result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -56393,6 +56409,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
{ (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
{ (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
{ (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
{ (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
{ (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
@@ -57366,7 +57383,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
{ (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
{ (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},
{ (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
@@ -60152,6 +60168,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
wxPython/src/gtk/_gdi.py
+32 -2
View File
@@ -668,6 +668,24 @@ class Bitmap(GDIObject):
"""
return _gdi_.Bitmap_SetSize(*args, **kwargs)
def CopyFromBuffer(*args, **kwargs):
"""
CopyFromBuffer(self, buffer data)
Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more .
"""
return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
def CopyFromBufferRGBA(*args, **kwargs):
"""
CopyFromBufferRGBA(self, buffer data)
Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more .
"""
return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def __eq__(*args, **kwargs):
"""__eq__(self, Bitmap other) -> bool"""
@@ -3367,6 +3385,10 @@ class DC(_core.Object):
"""
return _gdi_.DC_BlitPointSize(*args, **kwargs)
def GetAsBitmap(*args, **kwargs):
"""GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
return _gdi_.DC_GetAsBitmap(*args, **kwargs)
def SetClippingRegion(*args, **kwargs):
"""
SetClippingRegion(self, int x, int y, int width, int height)
@@ -4511,6 +4533,10 @@ class MemoryDC(DC):
"""
return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
def SelectObjectAsSource(*args, **kwargs):
"""SelectObjectAsSource(self, Bitmap bmp)"""
return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
_gdi_.MemoryDC_swigregister(MemoryDC)
def MemoryDCFromDC(*args, **kwargs):
@@ -4966,8 +4992,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
class GraphicsMatrix(GraphicsObject):
"""Proxy of C++ GraphicsMatrix class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsMatrix"""
_gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsMatrix
__del__ = lambda self : None;
def Concat(*args, **kwargs):
@@ -5072,8 +5100,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
class GraphicsPath(GraphicsObject):
"""Proxy of C++ GraphicsPath class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsPath"""
_gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsPath
__del__ = lambda self : None;
def MoveToPoint(*args):
wxPython/src/gtk/_gdi_wrap.cpp
+283 -21
View File
@@ -2926,6 +2926,18 @@ SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*s
#include <wx/rawbmp.h>
// See http://tinyurl.com/e5adr for what premultiplying alpha means. It
// appears to me that the other platforms are already doing it, so I'll just
// automatically do it for wxMSW here.
#ifdef __WXMSW__
#define wxPy_premultiply(p, a) ((p) * (a) / 0xff)
#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p))
#else
#define wxPy_premultiply(p, a) (p)
#define wxPy_unpremultiply(p, a) (p)
#endif
#include <wx/image.h>
static char** ConvertListOfStrings(PyObject* listOfStrings) {
@@ -2976,20 +2988,67 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){
self->SetWidth(size.x);
self->SetHeight(size.y);
}
SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : false; }
SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : true; }
SWIGINTERN void wxBitmap_CopyFromBuffer(wxBitmap *self,buffer data,int DATASIZE){
int height=self->GetHeight();
int width=self->GetWidth();
// See http://tinyurl.com/e5adr for what premultiplying alpha means. It
// appears to me that the other platforms are already doing it, so I'll just
// automatically do it for wxMSW here.
#ifdef __WXMSW__
#define wxPy_premultiply(p, a) ((p) * (a) / 0xff)
#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p))
#else
#define wxPy_premultiply(p, a) (p)
#define wxPy_unpremultiply(p, a) (p)
#endif
if (DATASIZE != width * height * 3) {
wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
}
wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
if (! pixData) {
// raise an exception...
wxPyErr_SetString(PyExc_RuntimeError,
"Failed to gain raw access to bitmap data.");
return;
}
wxNativePixelData::Iterator p(pixData);
for (int y=0; y<height; y++) {
wxNativePixelData::Iterator rowStart = p;
for (int x=0; x<width; x++) {
p.Red() = *(data++);
p.Green() = *(data++);
p.Blue() = *(data++);
++p;
}
p = rowStart;
p.OffsetY(pixData, 1);
}
}
SWIGINTERN void wxBitmap_CopyFromBufferRGBA(wxBitmap *self,buffer data,int DATASIZE){
int height=self->GetHeight();
int width=self->GetWidth();
if (DATASIZE != width * height * 4) {
wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size.");
}
wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height));
if (! pixData) {
// raise an exception...
wxPyErr_SetString(PyExc_RuntimeError,
"Failed to gain raw access to bitmap data.");
return;
}
pixData.UseAlpha();
wxAlphaPixelData::Iterator p(pixData);
for (int y=0; y<height; y++) {
wxAlphaPixelData::Iterator rowStart = p;
for (int x=0; x<width; x++) {
byte a = data[3];
p.Red() = wxPy_premultiply(*(data++), a);
p.Green() = wxPy_premultiply(*(data++), a);
p.Blue() = wxPy_premultiply(*(data++), a);
p.Alpha() = a; data++;
++p;
}
p = rowStart;
p.OffsetY(pixData, 1);
}
}
SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? self->IsSameAs(*other) : false; }
SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? !self->IsSameAs(*other) : true; }
wxBitmap* _BitmapFromBufferAlpha(int width, int height,
buffer data, int DATASIZE,
@@ -6892,6 +6951,76 @@ fail:
}
SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxBitmap *arg1 = (wxBitmap *) 0 ;
buffer arg2 ;
int arg3 ;
void *argp1 = 0 ;
int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "data", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBuffer",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBitmap, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bitmap_CopyFromBuffer" "', expected argument " "1"" of type '" "wxBitmap *""'");
}
arg1 = reinterpret_cast< wxBitmap * >(argp1);
{
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
}
{
wxBitmap_CopyFromBuffer(arg1,arg2,arg3);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxBitmap *arg1 = (wxBitmap *) 0 ;
buffer arg2 ;
int arg3 ;
void *argp1 = 0 ;
int res1 = 0 ;
Py_ssize_t temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "data", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBufferRGBA",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBitmap, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bitmap_CopyFromBufferRGBA" "', expected argument " "1"" of type '" "wxBitmap *""'");
}
arg1 = reinterpret_cast< wxBitmap * >(argp1);
{
if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail;
arg3 = (int)temp2;
}
{
wxBitmap_CopyFromBufferRGBA(arg1,arg2,arg3);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxBitmap *arg1 = (wxBitmap *) 0 ;
@@ -19677,6 +19806,47 @@ fail:
}
SWIGINTERN PyObject *_wrap_DC_GetAsBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxDC *arg1 = (wxDC *) 0 ;
wxRect *arg2 = (wxRect *) NULL ;
SwigValueWrapper<wxBitmap > result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "subrect", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DC_GetAsBitmap",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetAsBitmap" "', expected argument " "1"" of type '" "wxDC const *""'");
}
arg1 = reinterpret_cast< wxDC * >(argp1);
if (obj1) {
res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRect, 0 | 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DC_GetAsBitmap" "', expected argument " "2"" of type '" "wxRect const *""'");
}
arg2 = reinterpret_cast< wxRect * >(argp2);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxDC const *)arg1)->GetAsBitmap((wxRect const *)arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxDC *arg1 = (wxDC *) 0 ;
@@ -23745,7 +23915,7 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxBitmap const &arg1_defvalue = wxNullBitmap ;
wxBitmap &arg1_defvalue = wxNullBitmap ;
wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
wxMemoryDC *result = 0 ;
void *argp1 = 0 ;
@@ -23757,19 +23927,19 @@ SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail;
if (obj0) {
res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 | 0);
res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap const &""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'");
}
if (!argp1) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'");
}
arg1 = reinterpret_cast< wxBitmap * >(argp1);
}
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxMemoryDC *)new wxMemoryDC((wxBitmap const &)*arg1);
result = (wxMemoryDC *)new wxMemoryDC(*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -23831,17 +24001,58 @@ SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self),
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'");
}
arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'");
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'");
}
arg2 = reinterpret_cast< wxBitmap * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectObject((wxBitmap const &)*arg2);
(arg1)->SelectObject(*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
wxBitmap *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "bmp", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'");
}
arg1 = reinterpret_cast< wxMemoryDC * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'");
}
arg2 = reinterpret_cast< wxBitmap * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectObjectAsSource((wxBitmap const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -25151,6 +25362,22 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxGraphicsMatrix *result = 0 ;
if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
{
result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
@@ -25736,6 +25963,29 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Py_Void();
}
SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxGraphicsPath *result = 0 ;
if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxGraphicsPath *)new wxGraphicsPath();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
@@ -26962,6 +27212,10 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Py_Void();
}
SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN int NullGraphicsPen_set(PyObject *) {
SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
return 1;
@@ -37923,6 +38177,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap_CopyFromBuffer", (PyCFunction) _wrap_Bitmap_CopyFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap_CopyFromBufferRGBA", (PyCFunction) _wrap_Bitmap_CopyFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL},
@@ -38265,6 +38521,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_GetAsBitmap", (PyCFunction) _wrap_DC_GetAsBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -38374,6 +38631,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL},
{ (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL},
{ (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL},
@@ -38440,6 +38698,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
{ (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
{ (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
{ (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},
{ (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
{ (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -38454,6 +38713,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
{ (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
{ (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
{ (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},
{ (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
{ (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
{ (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
@@ -38474,6 +38735,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
{ (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
{ (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
{ (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},
{ (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
{ (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
{ (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL},
wxPython/src/gtk/_misc.py
+13
View File
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
_misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
self._setCallbackInfo(self, Process)
__swig_destroy__ = _misc_.delete_Process
__del__ = lambda self : None;
def GetPid(*args, **kwargs):
"""
GetPid(self) -> long
get the process ID of the process executed by Open()
"""
return _misc_.Process_GetPid(*args, **kwargs)
def _setCallbackInfo(*args, **kwargs):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.Process__setCallbackInfo(*args, **kwargs)
@@ -3369,6 +3379,7 @@ class DateTime(object):
GMT10 = _misc_.DateTime_GMT10
GMT11 = _misc_.DateTime_GMT11
GMT12 = _misc_.DateTime_GMT12
GMT13 = _misc_.DateTime_GMT13
WET = _misc_.DateTime_WET
WEST = _misc_.DateTime_WEST
CET = _misc_.DateTime_CET
@@ -3394,6 +3405,8 @@ class DateTime(object):
A_CST = _misc_.DateTime_A_CST
A_EST = _misc_.DateTime_A_EST
A_ESST = _misc_.DateTime_A_ESST
NZST = _misc_.DateTime_NZST
NZDT = _misc_.DateTime_NZDT
UTC = _misc_.DateTime_UTC
Gregorian = _misc_.DateTime_Gregorian
Julian = _misc_.DateTime_Julian
wxPython/src/gtk/_misc_wrap.cpp
+61
View File
@@ -14415,6 +14415,62 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_Process(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyProcess, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Process" "', expected argument " "1"" of type '" "wxPyProcess *""'");
}
arg1 = reinterpret_cast< wxPyProcess * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Process_GetPid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
long result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyProcess, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Process_GetPid" "', expected argument " "1"" of type '" "wxPyProcess const *""'");
}
arg1 = reinterpret_cast< wxPyProcess * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxPyProcess const *)arg1)->GetPid();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
@@ -39366,6 +39422,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_Process", (PyCFunction)_wrap_delete_Process, METH_O, NULL},
{ (char *)"Process_GetPid", (PyCFunction)_wrap_Process_GetPid, METH_O, NULL},
{ (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},
@@ -42096,6 +42154,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));
SWIG_Python_SetConstant(d, "DateTime_GMT13",SWIG_From_int(static_cast< int >(wxDateTime::GMT13)));
SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));
@@ -42121,6 +42180,8 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));
SWIG_Python_SetConstant(d, "DateTime_NZST",SWIG_From_int(static_cast< int >(wxDateTime::NZST)));
SWIG_Python_SetConstant(d, "DateTime_NZDT",SWIG_From_int(static_cast< int >(wxDateTime::NZDT)));
SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));
wxPython/src/gtk/_windows.py
+8
View File
@@ -3895,6 +3895,10 @@ class PrintData(_core.Object):
"""GetPrintMode(self) -> int"""
return _windows_.PrintData_GetPrintMode(*args, **kwargs)
def GetMedia(*args, **kwargs):
"""GetMedia(self) -> int"""
return _windows_.PrintData_GetMedia(*args, **kwargs)
def SetNoCopies(*args, **kwargs):
"""SetNoCopies(self, int v)"""
return _windows_.PrintData_SetNoCopies(*args, **kwargs)
@@ -3939,6 +3943,10 @@ class PrintData(_core.Object):
"""SetPrintMode(self, int printMode)"""
return _windows_.PrintData_SetPrintMode(*args, **kwargs)
def SetMedia(*args, **kwargs):
"""SetMedia(self, int media)"""
return _windows_.PrintData_SetMedia(*args, **kwargs)
def GetFilename(*args, **kwargs):
"""GetFilename(self) -> String"""
return _windows_.PrintData_GetFilename(*args, **kwargs)
wxPython/src/gtk/_windows_wrap.cpp
+68
View File
@@ -24073,6 +24073,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'");
}
arg1 = reinterpret_cast< wxPrintData * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)((wxPrintData const *)arg1)->GetMedia();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -24496,6 +24524,44 @@ fail:
}
SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
int arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "media", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'");
}
arg1 = reinterpret_cast< wxPrintData * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetMedia(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -31978,6 +32044,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
{ (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
{ (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
{ (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},
{ (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -31989,6 +32056,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
{ (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
wxPython/src/gtk/aui.py
+53 -12
View File
@@ -194,6 +194,20 @@ AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
AUI_BUTTON_MAXIMIZE = _aui.AUI_BUTTON_MAXIMIZE
AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
AUI_BUTTON_DOWN = _aui.AUI_BUTTON_DOWN
AUI_BUTTON_CUSTOM1 = _aui.AUI_BUTTON_CUSTOM1
AUI_BUTTON_CUSTOM2 = _aui.AUI_BUTTON_CUSTOM2
AUI_BUTTON_CUSTOM3 = _aui.AUI_BUTTON_CUSTOM3
AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK
@@ -1442,17 +1456,6 @@ class TabArt(object):
__repr__ = _swig_repr
__swig_destroy__ = _aui.delete_TabArt
__del__ = lambda self : None;
def DrawBackground(*args, **kwargs):
"""DrawBackground(self, DC dc, Rect rect)"""
return _aui.TabArt_DrawBackground(*args, **kwargs)
def DrawTab(*args, **kwargs):
"""
DrawTab(self, DC dc, Rect in_rect, String caption, bool active, Rect out_rect,
int x_extent)
"""
return _aui.TabArt_DrawTab(*args, **kwargs)
def SetNormalFont(*args, **kwargs):
"""SetNormalFont(self, Font font)"""
return _aui.TabArt_SetNormalFont(*args, **kwargs)
@@ -1465,6 +1468,32 @@ class TabArt(object):
"""SetMeasuringFont(self, Font font)"""
return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
def DrawBackground(*args, **kwargs):
"""DrawBackground(self, DC dc, Rect rect)"""
return _aui.TabArt_DrawBackground(*args, **kwargs)
def DrawTab(*args, **kwargs):
"""
DrawTab(self, DC dc, Rect in_rect, String caption, bool active, Rect out_rect,
int x_extent)
"""
return _aui.TabArt_DrawTab(*args, **kwargs)
def DrawButton(*args, **kwargs):
"""
DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state,
int orientation, Bitmap bitmap_override, Rect out_rect)
"""
return _aui.TabArt_DrawButton(*args, **kwargs)
def GetTabSize(*args, **kwargs):
"""GetTabSize(self, DC dc, String caption, bool active, int x_extent) -> Size"""
return _aui.TabArt_GetTabSize(*args, **kwargs)
def GetBestTabCtrlSize(*args, **kwargs):
"""GetBestTabCtrlSize(self, Window wnd) -> int"""
return _aui.TabArt_GetBestTabCtrlSize(*args, **kwargs)
_aui.TabArt_swigregister(TabArt)
class DefaultTabArt(TabArt):
@@ -1533,6 +1562,7 @@ class AuiTabContainerButton(object):
cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)
rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
_aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
@@ -1629,9 +1659,20 @@ class AuiTabContainer(object):
return _aui.AuiTabContainer_SetRect(*args, **kwargs)
def AddButton(*args, **kwargs):
"""AddButton(self, int id, int location, Bitmap bmp)"""
"""
AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap,
Bitmap disabled_bitmap=wxNullBitmap)
"""
return _aui.AuiTabContainer_AddButton(*args, **kwargs)
def GetTabOffset(*args, **kwargs):
"""GetTabOffset(self) -> size_t"""
return _aui.AuiTabContainer_GetTabOffset(*args, **kwargs)
def SetTabOffset(*args, **kwargs):
"""SetTabOffset(self, size_t offset)"""
return _aui.AuiTabContainer_SetTabOffset(*args, **kwargs)
ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`")
PageCount = property(GetPageCount,doc="See `GetPageCount`")
Pages = property(GetPages,doc="See `GetPages`")
wxPython/src/gtk/aui_wrap.cpp
+499 -49
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/html.py
+46 -12
View File
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
self._setOORInfo(self)
return val
class HtmlWindowEvent(_core.NotifyEvent):
"""Proxy of C++ HtmlWindowEvent class"""
wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
class HtmlCellEvent(_core.CommandEvent):
"""Proxy of C++ HtmlCellEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
_html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
"""
__init__(self, EventType commandType, int id, HtmlCell cell, Point pt,
MouseEvent ev) -> HtmlCellEvent
"""
_html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
def GetCell(*args, **kwargs):
"""GetCell(self) -> HtmlCell"""
return _html.HtmlCellEvent_GetCell(*args, **kwargs)
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
def GetPoint(*args, **kwargs):
"""GetPoint(self) -> Point"""
return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`")
_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
def GetMouseEvent(*args, **kwargs):
"""GetMouseEvent(self) -> MouseEvent"""
return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
def SetLinkClicked(*args, **kwargs):
"""SetLinkClicked(self, bool linkclicked)"""
return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
def GetLinkClicked(*args, **kwargs):
"""GetLinkClicked(self) -> bool"""
return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
_html.HtmlCellEvent_swigregister(HtmlCellEvent)
class HtmlLinkEvent(_core.CommandEvent):
"""Proxy of C++ HtmlLinkEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
_html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
def GetLinkInfo(*args, **kwargs):
"""GetLinkInfo(self) -> HtmlLinkInfo"""
return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
EVT_HTML_CELL_HOVER = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )
class HtmlHelpFrame(_windows.Frame):
"""Proxy of C++ HtmlHelpFrame class"""
wxPython/src/gtk/html_wrap.cpp
+521 -323
View File
File diff suppressed because one or more lines are too long
wxPython/src/html.i
+33 -6
View File
@@ -1569,20 +1569,47 @@ public:
%property(TreeCtrl, GetTreeCtrl, doc="See `GetTreeCtrl`");
};
//---------------------------------------------------------------------------
class wxHtmlWindowEvent: public wxNotifyEvent
%constant wxEventType wxEVT_COMMAND_HTML_CELL_CLICKED;
%constant wxEventType wxEVT_COMMAND_HTML_CELL_HOVER;
%constant wxEventType wxEVT_COMMAND_HTML_LINK_CLICKED;
class wxHtmlCellEvent : public wxCommandEvent
{
public:
wxHtmlWindowEvent(wxEventType commandType = wxEVT_NULL, int id = 0):
wxNotifyEvent(commandType, id);
wxHtmlCellEvent(wxEventType commandType, int id,
wxHtmlCell *cell, const wxPoint &pt,
const wxMouseEvent &ev);
void SetURL(const wxString& url);
const wxString& GetURL() const;
wxHtmlCell* GetCell() const;
wxPoint GetPoint() const;
wxMouseEvent GetMouseEvent() const;
%property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");
void SetLinkClicked(bool linkclicked);
bool GetLinkClicked() const;
};
class wxHtmlLinkEvent : public wxCommandEvent
{
public:
wxHtmlLinkEvent(int id, const wxHtmlLinkInfo &linkinfo);
const wxHtmlLinkInfo &GetLinkInfo() const;
};
%pythoncode {
EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
EVT_HTML_CELL_HOVER = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )
}
//---------------------------------------------------------------------------
MustHaveApp(wxHtmlHelpFrame);
wxPython/src/mac/_controls.py
+4 -1
View File
@@ -3464,6 +3464,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
TB_HORIZONTAL = _controls_.TB_HORIZONTAL
TB_VERTICAL = _controls_.TB_VERTICAL
TB_TOP = _controls_.TB_TOP
TB_LEFT = _controls_.TB_LEFT
TB_BOTTOM = _controls_.TB_BOTTOM
TB_RIGHT = _controls_.TB_RIGHT
TB_3DBUTTONS = _controls_.TB_3DBUTTONS
TB_FLAT = _controls_.TB_FLAT
TB_DOCKABLE = _controls_.TB_DOCKABLE
@@ -3474,7 +3478,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
TB_BOTTOM = _controls_.TB_BOTTOM
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
wxPython/src/mac/_controls_wrap.cpp
+4 -1
View File
@@ -48967,6 +48967,10 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));
SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
@@ -48977,7 +48981,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
wxPython/src/mac/_core.py
+16 -12
View File
@@ -708,6 +708,16 @@ class Object(object):
args[0].this.own(False)
return _core_.Object_Destroy(*args, **kwargs)
def IsSameAs(*args, **kwargs):
"""
IsSameAs(self, Object p) -> bool
For wx.Objects that use C++ reference counting internally, this method
can be used to determine if two objects are referencing the same data
object.
"""
return _core_.Object_IsSameAs(*args, **kwargs)
ClassName = property(GetClassName,doc="See `GetClassName`")
_core_.Object_swigregister(Object)
_wxPySetDictionary = _core_._wxPySetDictionary
@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA
BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
CURSOR_NONE = _core_.CURSOR_NONE
@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
"""
return _core_.Window_GetBestFittingSize(*args, **kwargs)
def GetAdjustedBestSize(*args, **kwargs):
"""
GetAdjustedBestSize(self) -> Size
This method is similar to GetBestSize, except in one
thing. GetBestSize should return the minimum untruncated size of the
window, while this method will return the largest of BestSize and any
user specified minimum size. ie. it is the minimum size the window
should currently be drawn at, not the minimal size it can possibly
tolerate.
"""
return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
def GetAdjustedBestSize(self):
s = self.GetBestSize()
return wx.Size(max(s.width, self.GetMinWidth()),
max(s.height, self.GetMinHeight()))
GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')
def Center(*args, **kwargs):
"""
wxPython/src/mac/_core_wrap.cpp
+46 -29
View File
@@ -4510,6 +4510,50 @@ fail:
}
SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxObject *arg1 = (wxObject *) 0 ;
wxObject *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "p", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'");
}
arg1 = reinterpret_cast< wxObject * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
arg2 = reinterpret_cast< wxObject * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -34630,34 +34674,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
wxSize result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -56392,6 +56408,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
{ (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
{ (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
{ (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
{ (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
{ (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
@@ -57365,7 +57382,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
{ (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
{ (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},
{ (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
@@ -60151,6 +60167,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
wxPython/src/mac/_gdi.py
+37 -7
View File
@@ -671,6 +671,24 @@ class Bitmap(GDIObject):
"""
return _gdi_.Bitmap_SetSize(*args, **kwargs)
def CopyFromBuffer(*args, **kwargs):
"""
CopyFromBuffer(self, buffer data)
Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more .
"""
return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
def CopyFromBufferRGBA(*args, **kwargs):
"""
CopyFromBufferRGBA(self, buffer data)
Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more .
"""
return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def __eq__(*args, **kwargs):
"""__eq__(self, Bitmap other) -> bool"""
@@ -3366,6 +3384,10 @@ class DC(_core.Object):
"""
return _gdi_.DC_BlitPointSize(*args, **kwargs)
def GetAsBitmap(*args, **kwargs):
"""GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
return _gdi_.DC_GetAsBitmap(*args, **kwargs)
def SetClippingRegion(*args, **kwargs):
"""
SetClippingRegion(self, int x, int y, int width, int height)
@@ -4510,6 +4532,10 @@ class MemoryDC(DC):
"""
return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
def SelectObjectAsSource(*args, **kwargs):
"""SelectObjectAsSource(self, Bitmap bmp)"""
return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
_gdi_.MemoryDC_swigregister(MemoryDC)
def MemoryDCFromDC(*args, **kwargs):
@@ -4993,8 +5019,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
class GraphicsMatrix(GraphicsObject):
"""Proxy of C++ GraphicsMatrix class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsMatrix"""
_gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsMatrix
__del__ = lambda self : None;
def Concat(*args, **kwargs):
@@ -5099,8 +5127,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
class GraphicsPath(GraphicsObject):
"""Proxy of C++ GraphicsPath class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsPath"""
_gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsPath
__del__ = lambda self : None;
def MoveToPoint(*args):
@@ -5253,8 +5283,8 @@ class GraphicsPath(GraphicsObject):
def Contains(*args):
"""
Contains(self, Double x, Double y, int fillStyle=WINDING_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=WINDING_RULE) -> bool
Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool
"""
return _gdi_.GraphicsPath_Contains(*args)
@@ -5475,7 +5505,7 @@ class GraphicsContext(GraphicsObject):
def FillPath(*args, **kwargs):
"""
FillPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)
fills a path with the current brush
"""
@@ -5483,7 +5513,7 @@ class GraphicsContext(GraphicsObject):
def DrawPath(*args, **kwargs):
"""
DrawPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)
draws a path by first filling and then stroking
"""
@@ -5543,7 +5573,7 @@ class GraphicsContext(GraphicsObject):
def DrawLines(*args, **kwargs):
"""
DrawLines(self, size_t points, int fillStyle=WINDING_RULE)
DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE)
draws a polygon
"""
wxPython/src/mac/_gdi_wrap.cpp
+304 -42
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/_misc.py
+13
View File
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
_misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
self._setCallbackInfo(self, Process)
__swig_destroy__ = _misc_.delete_Process
__del__ = lambda self : None;
def GetPid(*args, **kwargs):
"""
GetPid(self) -> long
get the process ID of the process executed by Open()
"""
return _misc_.Process_GetPid(*args, **kwargs)
def _setCallbackInfo(*args, **kwargs):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.Process__setCallbackInfo(*args, **kwargs)
@@ -3369,6 +3379,7 @@ class DateTime(object):
GMT10 = _misc_.DateTime_GMT10
GMT11 = _misc_.DateTime_GMT11
GMT12 = _misc_.DateTime_GMT12
GMT13 = _misc_.DateTime_GMT13
WET = _misc_.DateTime_WET
WEST = _misc_.DateTime_WEST
CET = _misc_.DateTime_CET
@@ -3394,6 +3405,8 @@ class DateTime(object):
A_CST = _misc_.DateTime_A_CST
A_EST = _misc_.DateTime_A_EST
A_ESST = _misc_.DateTime_A_ESST
NZST = _misc_.DateTime_NZST
NZDT = _misc_.DateTime_NZDT
UTC = _misc_.DateTime_UTC
Gregorian = _misc_.DateTime_Gregorian
Julian = _misc_.DateTime_Julian
wxPython/src/mac/_misc_wrap.cpp
+61
View File
@@ -14407,6 +14407,62 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_Process(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyProcess, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Process" "', expected argument " "1"" of type '" "wxPyProcess *""'");
}
arg1 = reinterpret_cast< wxPyProcess * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Process_GetPid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
long result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyProcess, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Process_GetPid" "', expected argument " "1"" of type '" "wxPyProcess const *""'");
}
arg1 = reinterpret_cast< wxPyProcess * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxPyProcess const *)arg1)->GetPid();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Process__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyProcess *arg1 = (wxPyProcess *) 0 ;
@@ -39427,6 +39483,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_Process", (PyCFunction)_wrap_delete_Process, METH_O, NULL},
{ (char *)"Process_GetPid", (PyCFunction)_wrap_Process_GetPid, METH_O, NULL},
{ (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Process_Redirect", (PyCFunction)_wrap_Process_Redirect, METH_O, NULL},
@@ -42163,6 +42221,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "DateTime_GMT10",SWIG_From_int(static_cast< int >(wxDateTime::GMT10)));
SWIG_Python_SetConstant(d, "DateTime_GMT11",SWIG_From_int(static_cast< int >(wxDateTime::GMT11)));
SWIG_Python_SetConstant(d, "DateTime_GMT12",SWIG_From_int(static_cast< int >(wxDateTime::GMT12)));
SWIG_Python_SetConstant(d, "DateTime_GMT13",SWIG_From_int(static_cast< int >(wxDateTime::GMT13)));
SWIG_Python_SetConstant(d, "DateTime_WET",SWIG_From_int(static_cast< int >(wxDateTime::WET)));
SWIG_Python_SetConstant(d, "DateTime_WEST",SWIG_From_int(static_cast< int >(wxDateTime::WEST)));
SWIG_Python_SetConstant(d, "DateTime_CET",SWIG_From_int(static_cast< int >(wxDateTime::CET)));
@@ -42188,6 +42247,8 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "DateTime_A_CST",SWIG_From_int(static_cast< int >(wxDateTime::A_CST)));
SWIG_Python_SetConstant(d, "DateTime_A_EST",SWIG_From_int(static_cast< int >(wxDateTime::A_EST)));
SWIG_Python_SetConstant(d, "DateTime_A_ESST",SWIG_From_int(static_cast< int >(wxDateTime::A_ESST)));
SWIG_Python_SetConstant(d, "DateTime_NZST",SWIG_From_int(static_cast< int >(wxDateTime::NZST)));
SWIG_Python_SetConstant(d, "DateTime_NZDT",SWIG_From_int(static_cast< int >(wxDateTime::NZDT)));
SWIG_Python_SetConstant(d, "DateTime_UTC",SWIG_From_int(static_cast< int >(wxDateTime::UTC)));
SWIG_Python_SetConstant(d, "DateTime_Gregorian",SWIG_From_int(static_cast< int >(wxDateTime::Gregorian)));
SWIG_Python_SetConstant(d, "DateTime_Julian",SWIG_From_int(static_cast< int >(wxDateTime::Julian)));
wxPython/src/mac/_windows.py
+8
View File
@@ -3875,6 +3875,10 @@ class PrintData(_core.Object):
"""GetPrintMode(self) -> int"""
return _windows_.PrintData_GetPrintMode(*args, **kwargs)
def GetMedia(*args, **kwargs):
"""GetMedia(self) -> int"""
return _windows_.PrintData_GetMedia(*args, **kwargs)
def SetNoCopies(*args, **kwargs):
"""SetNoCopies(self, int v)"""
return _windows_.PrintData_SetNoCopies(*args, **kwargs)
@@ -3919,6 +3923,10 @@ class PrintData(_core.Object):
"""SetPrintMode(self, int printMode)"""
return _windows_.PrintData_SetPrintMode(*args, **kwargs)
def SetMedia(*args, **kwargs):
"""SetMedia(self, int media)"""
return _windows_.PrintData_SetMedia(*args, **kwargs)
def GetFilename(*args, **kwargs):
"""GetFilename(self) -> String"""
return _windows_.PrintData_GetFilename(*args, **kwargs)
wxPython/src/mac/_windows_wrap.cpp
+68
View File
@@ -23937,6 +23937,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'");
}
arg1 = reinterpret_cast< wxPrintData * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)((wxPrintData const *)arg1)->GetMedia();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -24360,6 +24388,44 @@ fail:
}
SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
int arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "media", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'");
}
arg1 = reinterpret_cast< wxPrintData * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetMedia(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPrintData *arg1 = (wxPrintData *) 0 ;
@@ -31839,6 +31905,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
{ (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
{ (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
{ (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},
{ (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -31850,6 +31917,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
{ (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
wxPython/src/mac/aui.py
+54 -13
View File
@@ -194,6 +194,20 @@ AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
AUI_BUTTON_STATE_NORMAL = _aui.AUI_BUTTON_STATE_NORMAL
AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
AUI_BUTTON_MAXIMIZE = _aui.AUI_BUTTON_MAXIMIZE
AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
AUI_BUTTON_DOWN = _aui.AUI_BUTTON_DOWN
AUI_BUTTON_CUSTOM1 = _aui.AUI_BUTTON_CUSTOM1
AUI_BUTTON_CUSTOM2 = _aui.AUI_BUTTON_CUSTOM2
AUI_BUTTON_CUSTOM3 = _aui.AUI_BUTTON_CUSTOM3
AUI_INSERT_PANE = _aui.AUI_INSERT_PANE
AUI_INSERT_ROW = _aui.AUI_INSERT_ROW
AUI_INSERT_DOCK = _aui.AUI_INSERT_DOCK
@@ -1442,17 +1456,6 @@ class TabArt(object):
__repr__ = _swig_repr
__swig_destroy__ = _aui.delete_TabArt
__del__ = lambda self : None;
def DrawBackground(*args, **kwargs):
"""DrawBackground(self, DC dc, Rect rect)"""
return _aui.TabArt_DrawBackground(*args, **kwargs)
def DrawTab(*args, **kwargs):
"""
DrawTab(self, DC dc, Rect in_rect, String caption, bool active, Rect out_rect,
int x_extent)
"""
return _aui.TabArt_DrawTab(*args, **kwargs)
def SetNormalFont(*args, **kwargs):
"""SetNormalFont(self, Font font)"""
return _aui.TabArt_SetNormalFont(*args, **kwargs)
@@ -1465,6 +1468,32 @@ class TabArt(object):
"""SetMeasuringFont(self, Font font)"""
return _aui.TabArt_SetMeasuringFont(*args, **kwargs)
def DrawBackground(*args, **kwargs):
"""DrawBackground(self, DC dc, Rect rect)"""
return _aui.TabArt_DrawBackground(*args, **kwargs)
def DrawTab(*args, **kwargs):
"""
DrawTab(self, DC dc, Rect in_rect, String caption, bool active, Rect out_rect,
int x_extent)
"""
return _aui.TabArt_DrawTab(*args, **kwargs)
def DrawButton(*args, **kwargs):
"""
DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state,
int orientation, Bitmap bitmap_override, Rect out_rect)
"""
return _aui.TabArt_DrawButton(*args, **kwargs)
def GetTabSize(*args, **kwargs):
"""GetTabSize(self, DC dc, String caption, bool active, int x_extent) -> Size"""
return _aui.TabArt_GetTabSize(*args, **kwargs)
def GetBestTabCtrlSize(*args, **kwargs):
"""GetBestTabCtrlSize(self, Window wnd) -> int"""
return _aui.TabArt_GetBestTabCtrlSize(*args, **kwargs)
_aui.TabArt_swigregister(TabArt)
class DefaultTabArt(TabArt):
@@ -1533,6 +1562,7 @@ class AuiTabContainerButton(object):
cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)
rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
_aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
@@ -1629,9 +1659,20 @@ class AuiTabContainer(object):
return _aui.AuiTabContainer_SetRect(*args, **kwargs)
def AddButton(*args, **kwargs):
"""AddButton(self, int id, int location, Bitmap bmp)"""
"""
AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap,
Bitmap disabled_bitmap=wxNullBitmap)
"""
return _aui.AuiTabContainer_AddButton(*args, **kwargs)
def GetTabOffset(*args, **kwargs):
"""GetTabOffset(self) -> size_t"""
return _aui.AuiTabContainer_GetTabOffset(*args, **kwargs)
def SetTabOffset(*args, **kwargs):
"""SetTabOffset(self, size_t offset)"""
return _aui.AuiTabContainer_SetTabOffset(*args, **kwargs)
ActivePage = property(GetActivePage,SetActivePage,doc="See `GetActivePage` and `SetActivePage`")
PageCount = property(GetPageCount,doc="See `GetPageCount`")
Pages = property(GetPages,doc="See `GetPages`")
@@ -1753,7 +1794,7 @@ class PyDockArt(DefaultDockArt):
__repr__ = _swig_repr
_aui.PyDockArt_swigregister(PyDockArt)
class PyTabArt(TabArt):
class PyTabArt(DefaultTabArt):
"""
This version of the `TabArt` class has been instrumented to be
subclassable in Python and to reflect all calls to the C++ base class
wxPython/src/mac/aui_wrap.cpp
+504 -51
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/html.py
+46 -12
View File
@@ -1664,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
self._setOORInfo(self)
return val
class HtmlWindowEvent(_core.NotifyEvent):
"""Proxy of C++ HtmlWindowEvent class"""
wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
class HtmlCellEvent(_core.CommandEvent):
"""Proxy of C++ HtmlCellEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
_html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
"""
__init__(self, EventType commandType, int id, HtmlCell cell, Point pt,
MouseEvent ev) -> HtmlCellEvent
"""
_html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
def GetCell(*args, **kwargs):
"""GetCell(self) -> HtmlCell"""
return _html.HtmlCellEvent_GetCell(*args, **kwargs)
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
def GetPoint(*args, **kwargs):
"""GetPoint(self) -> Point"""
return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`")
_html.HtmlWindowEvent_swigregister(HtmlWindowEvent)
def GetMouseEvent(*args, **kwargs):
"""GetMouseEvent(self) -> MouseEvent"""
return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
def SetLinkClicked(*args, **kwargs):
"""SetLinkClicked(self, bool linkclicked)"""
return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
def GetLinkClicked(*args, **kwargs):
"""GetLinkClicked(self) -> bool"""
return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
_html.HtmlCellEvent_swigregister(HtmlCellEvent)
class HtmlLinkEvent(_core.CommandEvent):
"""Proxy of C++ HtmlLinkEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
_html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
def GetLinkInfo(*args, **kwargs):
"""GetLinkInfo(self) -> HtmlLinkInfo"""
return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
EVT_HTML_CELL_HOVER = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )
class HtmlHelpFrame(_windows.Frame):
"""Proxy of C++ HtmlHelpFrame class"""
wxPython/src/mac/html_wrap.cpp
+524 -326
View File
File diff suppressed because one or more lines are too long
wxPython/src/msw/_controls.py
+4 -1
View File
@@ -3479,6 +3479,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
TB_HORIZONTAL = _controls_.TB_HORIZONTAL
TB_VERTICAL = _controls_.TB_VERTICAL
TB_TOP = _controls_.TB_TOP
TB_LEFT = _controls_.TB_LEFT
TB_BOTTOM = _controls_.TB_BOTTOM
TB_RIGHT = _controls_.TB_RIGHT
TB_3DBUTTONS = _controls_.TB_3DBUTTONS
TB_FLAT = _controls_.TB_FLAT
TB_DOCKABLE = _controls_.TB_DOCKABLE
@@ -3489,7 +3493,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
TB_BOTTOM = _controls_.TB_BOTTOM
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
wxPython/src/msw/_controls_wrap.cpp
+4 -1
View File
@@ -49267,6 +49267,10 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TOOL_STYLE_CONTROL",SWIG_From_int(static_cast< int >(wxTOOL_STYLE_CONTROL)));
SWIG_Python_SetConstant(d, "TB_HORIZONTAL",SWIG_From_int(static_cast< int >(wxTB_HORIZONTAL)));
SWIG_Python_SetConstant(d, "TB_VERTICAL",SWIG_From_int(static_cast< int >(wxTB_VERTICAL)));
SWIG_Python_SetConstant(d, "TB_TOP",SWIG_From_int(static_cast< int >(wxTB_TOP)));
SWIG_Python_SetConstant(d, "TB_LEFT",SWIG_From_int(static_cast< int >(wxTB_LEFT)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_Python_SetConstant(d, "TB_RIGHT",SWIG_From_int(static_cast< int >(wxTB_RIGHT)));
SWIG_Python_SetConstant(d, "TB_3DBUTTONS",SWIG_From_int(static_cast< int >(wxTB_3DBUTTONS)));
SWIG_Python_SetConstant(d, "TB_FLAT",SWIG_From_int(static_cast< int >(wxTB_FLAT)));
SWIG_Python_SetConstant(d, "TB_DOCKABLE",SWIG_From_int(static_cast< int >(wxTB_DOCKABLE)));
@@ -49277,7 +49281,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "TB_HORZ_LAYOUT",SWIG_From_int(static_cast< int >(wxTB_HORZ_LAYOUT)));
SWIG_Python_SetConstant(d, "TB_HORZ_TEXT",SWIG_From_int(static_cast< int >(wxTB_HORZ_TEXT)));
SWIG_Python_SetConstant(d, "TB_NO_TOOLTIPS",SWIG_From_int(static_cast< int >(wxTB_NO_TOOLTIPS)));
SWIG_Python_SetConstant(d, "TB_BOTTOM",SWIG_From_int(static_cast< int >(wxTB_BOTTOM)));
SWIG_addvarlink(SWIG_globals(),(char*)"ListCtrlNameStr",ListCtrlNameStr_get, ListCtrlNameStr_set);
SWIG_Python_SetConstant(d, "LC_VRULES",SWIG_From_int(static_cast< int >(wxLC_VRULES)));
SWIG_Python_SetConstant(d, "LC_HRULES",SWIG_From_int(static_cast< int >(wxLC_HRULES)));
wxPython/src/msw/_core.py
+16 -12
View File
@@ -708,6 +708,16 @@ class Object(object):
args[0].this.own(False)
return _core_.Object_Destroy(*args, **kwargs)
def IsSameAs(*args, **kwargs):
"""
IsSameAs(self, Object p) -> bool
For wx.Objects that use C++ reference counting internally, this method
can be used to determine if two objects are referencing the same data
object.
"""
return _core_.Object_IsSameAs(*args, **kwargs)
ClassName = property(GetClassName,doc="See `GetClassName`")
_core_.Object_swigregister(Object)
_wxPySetDictionary = _core_._wxPySetDictionary
@@ -734,6 +744,7 @@ BITMAP_TYPE_PICT = _core_.BITMAP_TYPE_PICT
BITMAP_TYPE_ICON = _core_.BITMAP_TYPE_ICON
BITMAP_TYPE_ANI = _core_.BITMAP_TYPE_ANI
BITMAP_TYPE_IFF = _core_.BITMAP_TYPE_IFF
BITMAP_TYPE_TGA = _core_.BITMAP_TYPE_TGA
BITMAP_TYPE_MACCURSOR = _core_.BITMAP_TYPE_MACCURSOR
BITMAP_TYPE_ANY = _core_.BITMAP_TYPE_ANY
CURSOR_NONE = _core_.CURSOR_NONE
@@ -8594,18 +8605,11 @@ class Window(EvtHandler):
"""
return _core_.Window_GetBestFittingSize(*args, **kwargs)
def GetAdjustedBestSize(*args, **kwargs):
"""
GetAdjustedBestSize(self) -> Size
This method is similar to GetBestSize, except in one
thing. GetBestSize should return the minimum untruncated size of the
window, while this method will return the largest of BestSize and any
user specified minimum size. ie. it is the minimum size the window
should currently be drawn at, not the minimal size it can possibly
tolerate.
"""
return _core_.Window_GetAdjustedBestSize(*args, **kwargs)
def GetAdjustedBestSize(self):
s = self.GetBestSize()
return wx.Size(max(s.width, self.GetMinWidth()),
max(s.height, self.GetMinHeight()))
GetAdjustedBestSize = wx._deprecated(GetAdjustedBestSize, 'Use `GetBestFittingSize` instead.')
def Center(*args, **kwargs):
"""
wxPython/src/msw/_core_wrap.cpp
+46 -29
View File
@@ -4495,6 +4495,50 @@ fail:
}
SWIGINTERN PyObject *_wrap_Object_IsSameAs(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxObject *arg1 = (wxObject *) 0 ;
wxObject *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "p", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Object_IsSameAs",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxObject, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Object_IsSameAs" "', expected argument " "1"" of type '" "wxObject const *""'");
}
arg1 = reinterpret_cast< wxObject * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxObject, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Object_IsSameAs" "', expected argument " "2"" of type '" "wxObject const &""'");
}
arg2 = reinterpret_cast< wxObject * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxObject const *)arg1)->IsSameAs((wxObject const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *Object_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -34615,34 +34659,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
wxSize result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetAdjustedBestSize" "', expected argument " "1"" of type '" "wxWindow const *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxWindow const *)arg1)->GetAdjustedBestSize();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -56418,6 +56434,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL},
{ (char *)"Object_GetClassName", (PyCFunction)_wrap_Object_GetClassName, METH_O, NULL},
{ (char *)"Object_Destroy", (PyCFunction)_wrap_Object_Destroy, METH_O, NULL},
{ (char *)"Object_IsSameAs", (PyCFunction) _wrap_Object_IsSameAs, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL},
{ (char *)"Size_width_set", _wrap_Size_width_set, METH_VARARGS, NULL},
{ (char *)"Size_width_get", (PyCFunction)_wrap_Size_width_get, METH_O, NULL},
@@ -57391,7 +57408,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_InvalidateBestSize", (PyCFunction)_wrap_Window_InvalidateBestSize, METH_O, NULL},
{ (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetBestFittingSize", (PyCFunction)_wrap_Window_GetBestFittingSize, METH_O, NULL},
{ (char *)"Window_GetAdjustedBestSize", (PyCFunction)_wrap_Window_GetAdjustedBestSize, METH_O, NULL},
{ (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_Fit", (PyCFunction)_wrap_Window_Fit, METH_O, NULL},
@@ -60178,6 +60194,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ICON",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ICON)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANI",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANI)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_IFF",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_IFF)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_TGA",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_TGA)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_MACCURSOR",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_MACCURSOR)));
SWIG_Python_SetConstant(d, "BITMAP_TYPE_ANY",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_ANY)));
SWIG_Python_SetConstant(d, "CURSOR_NONE",SWIG_From_int(static_cast< int >(wxCURSOR_NONE)));
wxPython/src/msw/_gdi.py
+37 -7
View File
@@ -693,6 +693,24 @@ class Bitmap(GDIObject):
"""CopyFromCursor(self, Cursor cursor) -> bool"""
return _gdi_.Bitmap_CopyFromCursor(*args, **kwargs)
def CopyFromBuffer(*args, **kwargs):
"""
CopyFromBuffer(self, buffer data)
Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more .
"""
return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
def CopyFromBufferRGBA(*args, **kwargs):
"""
CopyFromBufferRGBA(self, buffer data)
Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more .
"""
return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def __eq__(*args, **kwargs):
"""__eq__(self, Bitmap other) -> bool"""
@@ -3456,6 +3474,10 @@ class DC(_core.Object):
"""
return _gdi_.DC_BlitPointSize(*args, **kwargs)
def GetAsBitmap(*args, **kwargs):
"""GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
return _gdi_.DC_GetAsBitmap(*args, **kwargs)
def SetClippingRegion(*args, **kwargs):
"""
SetClippingRegion(self, int x, int y, int width, int height)
@@ -4604,6 +4626,10 @@ class MemoryDC(DC):
"""
return _gdi_.MemoryDC_SelectObject(*args, **kwargs)
def SelectObjectAsSource(*args, **kwargs):
"""SelectObjectAsSource(self, Bitmap bmp)"""
return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs)
_gdi_.MemoryDC_swigregister(MemoryDC)
def MemoryDCFromDC(*args, **kwargs):
@@ -5091,8 +5117,10 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
class GraphicsMatrix(GraphicsObject):
"""Proxy of C++ GraphicsMatrix class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsMatrix"""
_gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsMatrix
__del__ = lambda self : None;
def Concat(*args, **kwargs):
@@ -5197,8 +5225,10 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
class GraphicsPath(GraphicsObject):
"""Proxy of C++ GraphicsPath class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self) -> GraphicsPath"""
_gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
__swig_destroy__ = _gdi_.delete_GraphicsPath
__del__ = lambda self : None;
def MoveToPoint(*args):
@@ -5351,8 +5381,8 @@ class GraphicsPath(GraphicsObject):
def Contains(*args):
"""
Contains(self, Double x, Double y, int fillStyle=WINDING_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=WINDING_RULE) -> bool
Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool
"""
return _gdi_.GraphicsPath_Contains(*args)
@@ -5573,7 +5603,7 @@ class GraphicsContext(GraphicsObject):
def FillPath(*args, **kwargs):
"""
FillPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)
fills a path with the current brush
"""
@@ -5581,7 +5611,7 @@ class GraphicsContext(GraphicsObject):
def DrawPath(*args, **kwargs):
"""
DrawPath(self, GraphicsPath path, int fillStyle=WINDING_RULE)
DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE)
draws a path by first filling and then stroking
"""
@@ -5641,7 +5671,7 @@ class GraphicsContext(GraphicsObject):
def DrawLines(*args, **kwargs):
"""
DrawLines(self, size_t points, int fillStyle=WINDING_RULE)
DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE)
draws a polygon
"""
wxPython/src/msw/_gdi_wrap.cpp
+304 -42
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/_misc.py
+13
View File
@@ -1886,6 +1886,16 @@ class Process(_core.EvtHandler):
_misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
self._setCallbackInfo(self, Process)
__swig_destroy__ = _misc_.delete_Process
__del__ = lambda self : None;
def GetPid(*args, **kwargs):
"""
GetPid(self) -> long
get the process ID of the process executed by Open()
"""
return _misc_.Process_GetPid(*args, **kwargs)
def _setCallbackInfo(*args, **kwargs):
"""_setCallbackInfo(self, PyObject self, PyObject _class)"""
return _misc_.Process__setCallbackInfo(*args, **kwargs)
@@ -3369,6 +3379,7 @@ class DateTime(object):
GMT10 = _misc_.DateTime_GMT10
GMT11 = _misc_.DateTime_GMT11
GMT12 = _misc_.DateTime_GMT12
GMT13 = _misc_.DateTime_GMT13
WET = _misc_.DateTime_WET
WEST = _misc_.DateTime_WEST
CET = _misc_.DateTime_CET
@@ -3394,6 +3405,8 @@ class DateTime(object):
A_CST = _misc_.DateTime_A_CST
A_EST = _misc_.DateTime_A_EST
A_ESST = _misc_.DateTime_A_ESST
NZST = _misc_.DateTime_NZST
NZDT = _misc_.DateTime_NZDT
UTC = _misc_.DateTime_UTC
Gregorian = _misc_.DateTime_Gregorian
Julian = _misc_.DateTime_Julian

Some files were not shown because too many files have changed in this diff Show More