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

Merge recent changes from 2.8 branch.

Browse Source 
Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/_accel.i
+6 -1
View File
@@ -165,6 +165,11 @@ const wxAcceleratorTable wxNullAcceleratorTable;
%mutable;
wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
%pythoncode {
def GetAccelFromString(label):
entry = AcceleratorEntry()
entry.FromString(label)
return entry
}
//---------------------------------------------------------------------------
wxPython/src/_bitmap.i
+2 -2
View File
@@ -319,7 +319,7 @@ the ``type`` parameter.", "");
%extend {
DocStr(CopyFromBuffer,
"Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more details.", "");
See `wx.BitmapFromBuffer` for more details.", "");
void CopyFromBuffer(buffer data, int DATASIZE)
{
int height=self->GetHeight();
@@ -352,7 +352,7 @@ See `wxBitmapFromBuffer` for more details.", "");
DocStr(CopyFromBufferRGBA,
"Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more details.", "");
See `wx.BitmapFromBufferRGBA` for more details.", "");
void CopyFromBufferRGBA(buffer data, int DATASIZE)
{
int height=self->GetHeight();
wxPython/src/_cmndlgs.i
+19 -14
View File
@@ -113,9 +113,10 @@ wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
//--------------------------------------------------------------------------------
enum {
wxDD_CHANGE_DIR,
wxDD_DIR_MUST_EXIST,
wxDD_NEW_DIR_BUTTON,
wxDD_DEFAULT_STYLE,
wxDD_CHANGE_DIR,
};
DocStr(wxDirDialog,
@@ -129,10 +130,12 @@ Window Styles
wx.DEFAULT_DIALOG_STYLE, wx.DD_NEW_DIR_BUTTON
and wx.RESIZE_BORDER.
wx.DD_NEW_DIR_BUTTON Add 'Create new directory' button and allow
directory names to be editable. On Windows
the new directory button is only available
with recent versions of the common dialogs.
wx.DD_DIR_MUST_EXIST The dialog will allow the user to choose only an
existing folder. When this style is not given, a
'Create new directory' button is added to the dialog
(on Windows) or some other way is provided to the
user to type the name of a new folder.
Use this instead of deprecated wx.DD_NEW_DIR_BUTTON.
wx.DD_CHANGE_DIR Change the current working directory to the
directory chosen by the user.
@@ -195,15 +198,6 @@ public:
%}
enum {
// These will dissappear in 2.8
wxOPEN,
wxSAVE,
wxOVERWRITE_PROMPT,
wxFILE_MUST_EXIST,
wxMULTIPLE,
wxCHANGE_DIR,
wxHIDE_READONLY,
wxFD_OPEN,
wxFD_SAVE,
wxFD_OVERWRITE_PROMPT,
@@ -214,6 +208,17 @@ enum {
wxFD_DEFAULT_STYLE,
};
%pythoncode {
%# deprecated names
OPEN = FD_OPEN,
SAVE = FD_SAVE,
OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT,
FILE_MUST_EXIST = FD_FILE_MUST_EXIST,
MULTIPLE = FD_MULTIPLE,
CHANGE_DIR = FD_CHANGE_DIR
}
DocStr(wxFileDialog,
"wx.FileDialog allows the user to select one or more files from the
filesystem.", "
wxPython/src/_config.i
+4 -1
View File
@@ -419,8 +419,11 @@ public:
const wxString& globalFilename = wxPyEmptyString,
long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE),
"", "");
~wxFileConfig();
static wxString GetGlobalFileName(const wxString& szFile);
static wxString GetLocalFileName(const wxString& szFile, int style = 0);
};
wxPython/src/_datetime.i
-16
View File
@@ -510,10 +510,6 @@ public:
int n = 1,
Month month = Inv_Month,
int year = Inv_Year);
// wxDateTime GetWeekDay(WeekDay weekday,
// int n = 1,
// Month month = Inv_Month,
// int year = Inv_Year);
// sets to the last weekday in the given month, year
bool SetToLastWeekDay(WeekDay weekday,
@@ -523,17 +519,6 @@ public:
Month month = Inv_Month,
int year = Inv_Year);
// sets the date to the given day of the given week in the year,
// returns True on success and False if given date doesn't exist (e.g.
// numWeek is > 53)
bool SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday = Mon, WeekFlags flags = Monday_First);
wxDateTime GetWeek(wxDateTime_t numWeek, WeekDay weekday = Mon, WeekFlags flags = Monday_First);
%pythoncode {
SetToTheWeek = wx._deprecated(SetToTheWeek, "SetToTheWeek is deprecated, use (static) SetToWeekOfYear instead")
GetWeek = wx._deprecated(GetWeek, "GetWeek is deprecated, use GetWeekOfYear instead")
}
// returns the date corresponding to the given week day of the given
// week (in ISO notation) of the specified year
static wxDateTime SetToWeekOfYear(int year,
@@ -911,7 +896,6 @@ public:
%property(RataDie, GetRataDie, doc="See `GetRataDie`");
%property(Second, GetSecond, SetSecond, doc="See `GetSecond` and `SetSecond`");
%property(Ticks, GetTicks, doc="See `GetTicks`");
%property(Week, GetWeek, doc="See `GetWeek`");
%property(WeekDay, GetWeekDay, doc="See `GetWeekDay`");
%property(WeekDayInSameWeek, GetWeekDayInSameWeek, doc="See `GetWeekDayInSameWeek`");
%property(WeekOfMonth, GetWeekOfMonth, doc="See `GetWeekOfMonth`");
wxPython/src/_dc.i
+53 -1
View File
@@ -354,6 +354,57 @@ position.", "
BlitPointSize);
DocDeclStr(
bool , StretchBlit(wxCoord dstX, wxCoord dstY,
wxCoord dstWidth, wxCoord dstHeight,
wxDC *source,
wxCoord srcX, wxCoord srcY,
wxCoord srcWidth, wxCoord srcHeight,
int rop = wxCOPY, bool useMask = false,
wxCoord srcMaskX = wxDefaultCoord,
wxCoord srcMaskY = wxDefaultCoord),
"Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position.", "
:param xdest: Destination device context x position.
:param ydest: Destination device context y position.
:param dstWidth: Width of destination area.
:param dstHeight: Height of destination area.
:param source: Source device context.
:param xsrc: Source device context x position.
:param ysrc: Source device context y position.
:param srcWidth: Width of source area to be copied.
:param srcHeight: Height of source area to be copied.
:param logicalFunc: Logical function to use: see `SetLogicalFunction`.
:param useMask: If true, StretchBlit does a transparent blit using
the mask that is associated with the bitmap selected
into the source device context.
:param xsrcMask: Source x position on the mask. If both xsrcMask and
ysrcMask are -1, xsrc and ysrc will be assumed for
the mask source position. Currently only implemented
on Windows.
:param ysrcMask: Source y position on the mask.
");
DocDeclStrName(
bool , StretchBlit(const wxPoint& dstPt, const wxSize& dstSize,
wxDC *source, const wxPoint& srcPt, const wxSize& srcSize,
int rop = wxCOPY, bool useMask = false,
const wxPoint& srcMaskPt = wxDefaultPosition),
"Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position. This version is the same as `StretchBlit`
except `wx.Point` and `wx.Size` objects are used instead of individual
position and size components.", "",
StretchBlitPointSize);
DocDeclStr(
wxBitmap , GetAsBitmap(const wxRect *subrect = NULL) const,
"", "");
@@ -1487,7 +1538,8 @@ destroyed safely.", "");
enum {
wxBUFFER_VIRTUAL_AREA,
wxBUFFER_CLIENT_AREA
wxBUFFER_CLIENT_AREA,
wxBUFFER_USES_SHARED_BUFFER
};
MustHaveApp(wxBufferedDC);
wxPython/src/_defs.i
+8 -9
View File
@@ -520,8 +520,6 @@ enum {
wxLB_EXTENDED,
wxLB_OWNERDRAW,
wxLB_HSCROLL,
wxPROCESS_ENTER,
wxPASSWORD,
wxCB_SIMPLE,
wxCB_DROPDOWN,
@@ -802,9 +800,8 @@ enum wxStretch
wxSHAPED,
wxFIXED_MINSIZE,
wxTILE,
wxADJUST_MINSIZE,
};
%pythoncode { ADJUST_MINSIZE = 0 }
enum wxBorder
{
@@ -907,8 +904,6 @@ enum wxKeyCode {
WXK_MENU,
WXK_PAUSE,
WXK_CAPITAL,
WXK_PRIOR, /* Page up */
WXK_NEXT, /* Page down */
WXK_END,
WXK_HOME,
WXK_LEFT,
@@ -978,9 +973,7 @@ enum wxKeyCode {
WXK_NUMPAD_UP,
WXK_NUMPAD_RIGHT,
WXK_NUMPAD_DOWN,
WXK_NUMPAD_PRIOR,
WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_NEXT,
WXK_NUMPAD_PAGEDOWN,
WXK_NUMPAD_END,
WXK_NUMPAD_BEGIN,
@@ -1023,7 +1016,13 @@ enum wxKeyCode {
WXK_SPECIAL20
};
// deprecated synonymns
%pythoncode {
WXK_PRIOR = WXK_PAGEUP
WXK_NEXT = WXK_PAGEDOWN
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN
}
typedef enum {
wxPAPER_NONE, // Use specific dimensions
wxPython/src/_display.i
+1 -1
View File
@@ -121,7 +121,7 @@ doesn't belong to any display", "");
"Find the display where the given window lies, return wx.NOT_FOUND if
it is not shown at all.", "");
static int GetFromWindow(wxWindow *window);
static int GetFromWindow(const wxWindow *window);
DocDeclStr(
wxPython/src/_event.i
+1 -1
View File
@@ -663,7 +663,7 @@ false otherwise (if it was).", "");
DocStr(wxScrollEvent,
"A scroll event holds information about events sent from stand-alone
scrollbars and sliders. Note that scrolled windows do not send
instnaces of this event class, but send the `wx.ScrollWinEvent`
instances of this event class, but send the `wx.ScrollWinEvent`
instead.", "
Events
wxPython/src/_functions.i
-4
View File
@@ -70,13 +70,9 @@ void wxBell();
MustHaveApp(wxEndBusyCursor);
void wxEndBusyCursor();
long wxGetElapsedTime(bool resetTimer = true);
%pythoncode { GetElapsedTime = wx._deprecated(GetElapsedTime) }
bool wxIsBusy();
wxString wxNow();
bool wxShell(const wxString& command = wxPyEmptyString);
void wxStartTimer();
DocDeclA(
wxPython/src/_graphics.i
+8 -6
View File
@@ -670,13 +670,15 @@ public:
static wxGraphicsContext* , CreateFromNative( void * context ) ,
"Creates a wx.GraphicsContext from a native context. This native
context must be eg a CGContextRef for Core Graphics, a Graphics
pointer for GDIPlus or a cairo_t pointer for Cairo.", "");
pointer for GDIPlus or a cairo_t pointer for Cairo. NOTE: For
wxPython we still need a way to make this value usable.", "");
%newobject CreateFromNative;
DocDeclStr(
static wxGraphicsContext* , CreateFromNativeWindow( void * window ) ,
"Creates a wx.GraphicsContext from a native window.", "");
"Creates a wx.GraphicsContext from a native window. NOTE: For wxPython
we still need a way to make this value usable.", "");
@@ -799,8 +801,7 @@ this context.", "");
DocDeclStr(
virtual wxGraphicsMatrix , GetTransform() const,
"Gets the current transformation matrix of this context.", "");
DocStr(SetPen, "Sets the stroke pen", "");
@@ -937,8 +938,9 @@ and the current brush is used for filling.", "");
%extend {
DocStr(StrokeLineSegements,
"Stroke disconnected lines from begin to end points", "");
DocAStr(StrokeLineSegements,
"StrokeLineSegments(self, List beginPoints, List endPoints)",
"Stroke disconnected lines from begin to end points", "");
void StrokeLineSegements(PyObject* beginPoints, PyObject* endPoints)
{
size_t c1, c2, count;
wxPython/src/_intl.i
+67 -64
View File
@@ -329,12 +329,12 @@ public:
~wxLocale();
%extend {
bool Init1(const wxString& szName,
const wxString& szShort = wxPyEmptyString,
const wxString& szLocale = wxPyEmptyString,
bool Init1(const wxString& name,
const wxString& shortName = wxPyEmptyString,
const wxString& locale = wxPyEmptyString,
bool bLoadDefault = true,
bool bConvertEncoding = false) {
bool rc = self->Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
bool rc = self->Init(name, shortName, locale, bLoadDefault, bConvertEncoding);
// Python before 2.4 needs to have LC_NUMERIC set to "C" in order
// for the floating point conversions and such to work right.
%#if PY_VERSION_HEX < 0x02040000
@@ -416,13 +416,13 @@ public:
// The loaded catalog will be used for message lookup by GetString().
//
// Returns 'True' if it was successfully loaded
bool AddCatalog(const wxString& szDomain);
bool AddCatalog(const wxString& domain);
// check if the given locale is provided by OS and C run time
static bool IsAvailable(int lang);
// check if the given catalog is loaded
bool IsLoaded(const wxString& szDomain) const;
bool IsLoaded(const wxString& domain) const;
// Retrieve the language info struct for the given language
//
@@ -455,8 +455,8 @@ public:
//
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
wxString GetString(const wxString& szOrigString,
const wxString& szDomain = wxPyEmptyString) const;
wxString GetString(const wxString& origString,
const wxString& domain = wxPyEmptyString) const;
// Returns the current short name for the locale
const wxString& GetName() const;
@@ -478,28 +478,31 @@ class wxPyLocale : public wxLocale
public:
wxPyLocale();
wxPyLocale(const wxChar *szName, // name (for messages)
const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files)
const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale)
bool bLoadDefault = true, // preload wxstd.mo?
bool bConvertEncoding = false); // convert Win<->Unix if necessary?
wxPyLocale(const wxString& name, // name (for messages)
const wxString& shortName = wxPyEmptyString, // dir prefix (for msg files)
const wxString& locale = wxPyEmptyString, // locale (for setlocale)
bool bLoadDefault = true, // preload wxstd.mo?
bool bConvertEncoding = false); // convert Win<->Unix if necessary?
wxPyLocale(int language, // wxLanguage id or custom language
int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
~wxPyLocale();
virtual const wxChar *GetString(const wxChar *szOrigString,
const wxChar *szDomain = NULL) const;
virtual const wxChar *GetString(const wxChar *szOrigString,
const wxChar *szOrigString2, size_t n,
const wxChar *szDomain = NULL) const;
virtual wxChar *GetSingularString(const wxChar *szOrigString,
const wxChar *szDomain = NULL) const;
virtual wxChar *GetPluralString(const wxChar *szOrigString,
const wxChar *szOrigString2, size_t n,
const wxChar *szDomain = NULL) const;
virtual const wxString& GetString(const wxString& origString,
const wxString& domain = wxPyEmptyString) const;
virtual const wxString& GetString(const wxString& origString,
const wxString& origString2,
size_t n,
const wxString& domain = wxPyEmptyString) const;
virtual const wxString& GetSingularString(const wxString& origString,
const wxString& domain = wxPyEmptyString) const;
virtual const wxString& GetPluralString(const wxString& origString,
const wxString& origString2,
size_t n,
const wxString& domain = wxPyEmptyString) const;
PYPRIVATE;
private:
@@ -510,12 +513,12 @@ wxPyLocale::wxPyLocale() : wxLocale()
{
}
wxPyLocale::wxPyLocale(const wxChar *szName, // name (for messages)
const wxChar *szShort, // dir prefix (for msg files)
const wxChar *szLocale, // locale (for setlocale)
bool bLoadDefault, // preload wxstd.mo?
bool bConvertEncoding) // convert Win<->Unix if necessary?
: wxLocale(szName, szShort, szLocale, bLoadDefault, bConvertEncoding)
wxPyLocale::wxPyLocale(const wxString& name, // name (for messages)
const wxString& shortName, // dir prefix (for msg files)
const wxString& locale, // locale (for setlocale)
bool bLoadDefault, // preload wxstd.mo?
bool bConvertEncoding) // convert Win<->Unix if necessary?
: wxLocale(name, shortName, locale, bLoadDefault, bConvertEncoding)
{
}
@@ -528,31 +531,29 @@ wxPyLocale::~wxPyLocale()
{
}
const wxChar *wxPyLocale::GetString(const wxChar *szOrigString,
const wxChar *szDomain) const
const wxString& wxPyLocale::GetString(const wxString& origString,
const wxString& domain) const
{
wxChar *str = GetSingularString(szOrigString, szDomain);
return (str != NULL) ? str : wxLocale::GetString(szOrigString, szDomain);
return GetSingularString(origString, domain);
}
const wxChar *wxPyLocale::GetString(const wxChar *szOrigString,
const wxChar *szOrigString2, size_t n,
const wxChar *szDomain) const
const wxString& wxPyLocale::GetString(const wxString& origString,
const wxString& origString2,
size_t n,
const wxString& domain) const
{
wxChar *str = GetPluralString(szOrigString, szOrigString2, n, szDomain);
return (str != NULL) ? str : wxLocale::GetString(szOrigString, szOrigString2, n, szDomain);
return GetPluralString(origString, origString2, n, domain);
}
wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString,
const wxChar *szDomain) const
const wxString& wxPyLocale::GetSingularString(const wxString& origString,
const wxString& domain) const
{
bool found;
static wxString str;
str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string.
wxString str( _T("error in translation"));
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) {
PyObject* param1 = wx2PyString(szOrigString);
PyObject* param2 = wx2PyString(szDomain);
if ((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) {
PyObject* param1 = wx2PyString(origString);
PyObject* param2 = wx2PyString(domain);
PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", param1, param2));
Py_DECREF(param1);
Py_DECREF(param2);
@@ -562,22 +563,24 @@ wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString,
}
}
wxPyEndBlockThreads(blocked);
return (found ? (wxChar*)str.c_str() : NULL);
return (found ? str : wxLocale::GetString(origString, domain));
}
wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString,
const wxChar *szOrigString2, size_t n,
const wxChar *szDomain) const
const wxString& wxPyLocale::GetPluralString(const wxString& origString,
const wxString& origString2, size_t n,
const wxString& domain) const
{
bool found;
static wxString str;
str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string.
wxString str( _T("error in translation"));
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) {
PyObject* param1 = wx2PyString(szOrigString);
PyObject* param2 = wx2PyString(szOrigString2);
PyObject* param4 = wx2PyString(szDomain);
PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiO)", param1, param2, (int)n, param4));
if ((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) {
PyObject* param1 = wx2PyString(origString);
PyObject* param2 = wx2PyString(origString2);
PyObject* param4 = wx2PyString(domain);
PyObject* ret = wxPyCBH_callCallbackObj(m_myInst,
Py_BuildValue("(OOiO)",
param1, param2,
(int)n, param4));
Py_DECREF(param1);
Py_DECREF(param2);
Py_DECREF(param4);
@@ -587,7 +590,7 @@ wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString,
}
}
wxPyEndBlockThreads(blocked);
return (found ? (wxChar*)str.c_str() : NULL);
return (found ? str : wxLocale::GetString(origString, origString2, n, domain) );
}
%}
@@ -619,11 +622,11 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
virtual const wxChar *GetSingularString(const wxChar *szOrigString,
const wxChar *szDomain = NULL) const;
virtual const wxChar *GetPluralString(const wxChar *szOrigString,
const wxChar *szOrigString2, size_t n,
const wxChar *szDomain = NULL) const;
virtual const wxString& GetSingularString(const wxString& origString,
const wxString& domain = wxPyEmptyString) const;
virtual const wxString& GetPluralString(const wxString& origString,
const wxString& origString2, size_t n,
const wxString& domain = wxPyEmptyString) const;
};
//---------------------------------------------------------------------------
wxPython/src/_menu.i
-1
View File
@@ -367,7 +367,6 @@ public:
}
%property(Frame, GetFrame, doc="See `GetFrame`");
%property(Menu, GetMenu, doc="See `GetMenu`");
%property(MenuCount, GetMenuCount, doc="See `GetMenuCount`");
%property(Menus, GetMenus, SetMenus, doc="See `GetMenus` and `SetMenus`");
};
wxPython/src/_sashwin.i
+4 -4
View File
@@ -76,11 +76,11 @@ public:
// Get whether there's a sash in this position
bool GetSashVisible(wxSashEdgePosition edge) const;
// Set whether there's a border in this position
void SetSashBorder(wxSashEdgePosition edge, bool border);
// // Set whether there's a border in this position
// void SetSashBorder(wxSashEdgePosition edge, bool border);
// Get whether there's a border in this position
bool HasBorder(wxSashEdgePosition edge) const;
// // Get whether there's a border in this position
// bool HasBorder(wxSashEdgePosition edge) const;
// Get border size
int GetEdgeMargin(wxSashEdgePosition edge) const;
wxPython/src/_sizers.i
+242 -14
View File
@@ -21,6 +21,155 @@
//---------------------------------------------------------------------------
%newgroup;
DocStr(wxSizerFlags,
"Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
to specify a lot of flags and parameters which can be unwieldy. This
is where wx.SizerFlags comes in: it allows you to specify all
parameters using the named methods instead. For example, instead of::
sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
you can now write::
sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
This is more readable and also allows you to create wx.SizerFlags
objects which can be reused for several sizer items.::
flagsExpand = wx.SizerFlags(1)
flagsExpand.Expand().Border(wx.ALL, 10)
sizer.AddF(ctrl1, flagsExpand)
sizer.AddF(ctrl2, flagsExpand)
Note that by specification, all methods of wx.SizerFlags return the
wx.SizerFlags object itself allowing chaining multiple method calls
like in the examples above.", "");
class wxSizerFlags
{
public:
// construct the flags object initialized with the given proportion (0 by
// default)
DocCtorStr(
wxSizerFlags(int proportion = 0),
"Constructs the flags object with the specified proportion.", "");
~wxSizerFlags();
// This typemap ensures that the returned object is the same
// Python instance as what was passed in as `self`, instead of
// creating a new proxy as SWIG would normally do.
%typemap(out) wxSizerFlags& { $result = $self; Py_INCREF($result); }
DocDeclStr(
wxSizerFlags& , Proportion(int proportion),
"Sets the item's proportion value.", "");
DocDeclStr(
wxSizerFlags& , Align(int alignment),
"Sets the item's alignment", "");
DocDeclStr(
wxSizerFlags& , Expand(),
"Sets the wx.EXPAND flag, which will cause the item to be expanded to
fill as much space as it is given by the sizer.", "");
DocDeclStr(
wxSizerFlags& , Centre(),
"Same as `Center` for those with an alternate dialect of English.", "");
DocDeclStr(
wxSizerFlags& , Center(),
"Sets the centering alignment flags.", "");
DocDeclStr(
wxSizerFlags& , Left(),
"Aligns the object to the left, a shortcut for calling
Align(wx.ALIGN_LEFT)", "");
DocDeclStr(
wxSizerFlags& , Right(),
"Aligns the object to the right, a shortcut for calling
Align(wx.ALIGN_RIGHT)", "");
DocDeclStr(
wxSizerFlags& , Top(),
"Aligns the object to the top of the available space, a shortcut for
calling Align(wx.ALIGN_TOP)", "");
DocDeclStr(
wxSizerFlags& , Bottom(),
"Aligns the object to the bottom of the available space, a shortcut for
calling Align(wx.ALIGN_BOTTOM)", "");
DocDeclStr(
wxSizerFlags& , Shaped(),
"Sets the wx.SHAPED flag.", "");
DocDeclStr(
wxSizerFlags& , FixedMinSize(),
"Sets the wx.FIXED_MINSIZE flag.", "");
%extend {
DocDeclStr(
wxSizerFlags& , Border(int direction=wxALL, int borderInPixels=-1),
"Sets the border of the item in the direction(s) or sides given by the
direction parameter. If the borderInPixels value is not given then
the default border size (see `GetDefaultBorder`) will be used.", "")
{
if (borderInPixels == -1)
return self->Border(direction);
else
return self->Border(direction, borderInPixels);
}
}
DocDeclStr(
wxSizerFlags& , DoubleBorder(int direction = wxALL),
"Sets the border in the given direction to twice the default border
size.", "");
DocDeclStr(
wxSizerFlags& , TripleBorder(int direction = wxALL),
"Sets the border in the given direction to three times the default
border size.", "");
DocDeclStr(
wxSizerFlags& , HorzBorder(),
"Sets the left and right borders to the default border size.", "");
DocDeclStr(
wxSizerFlags& , DoubleHorzBorder(),
"Sets the left and right borders to twice the default border size.", "");
// Clear the typemap
%typemap(out) wxSizerFlags& ;
DocDeclStr(
static int , GetDefaultBorder(),
"Returns the default border size used by the other border methods", "");
DocDeclStr(
int , GetProportion() const,
"Returns the proportion value to be used in the sizer item.", "");
DocDeclStr(
int , GetFlags() const,
"Returns the flags value to be used in the sizer item.", "");
DocDeclStr(
int , GetBorderInPixels() const,
"Returns the border value in pixels to be used in the sizer item.", "");
};
//---------------------------------------------------------------------------
DocStr(wxSizerItem,
"The wx.SizerItem class is used to track the position, size and other
attributes of each item managed by a `wx.Sizer`. It is not usually
@@ -444,7 +593,7 @@ public:
- **sizer**: The (child-)sizer to be added to the sizer. This
allows placing a child sizer in a sizer and thus to create
hierarchies of sizers (typically a vertical box as the top
hierarchies of sizers (for example a vertical box as the top
sizer and several horizontal boxes on the level beneath).
- **size**: A `wx.Size` or a 2-element sequence of integers
@@ -552,8 +701,34 @@ public:
return NULL;
}
// virtual wxSizerItem* AddSpacer(int size);
// virtual wxSizerItem* AddStretchSpacer(int prop = 1);
DocAStr(AddF,
"AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem",
"Similar to `Add` but uses the `wx.SizerFlags` convenience class for
setting the various flags, options and borders.", "");
wxSizerItem* AddF(PyObject* item, wxSizerFlags& flags) {
wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( info.sizer )
PyObject_SetAttrString(item,"thisown",Py_False);
wxPyEndBlockThreads(blocked);
// Now call the real Add method if a valid item type was found
if ( info.window )
return self->Add(info.window, flags);
else if ( info.sizer )
return self->Add(info.sizer, flags);
else if (info.gotSize)
return self->Add(info.size.GetWidth(), info.size.GetHeight(),
flags.GetProportion(),
flags.GetFlags(),
flags.GetBorderInPixels());
else
return NULL;
}
DocAStr(Insert,
"Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -586,8 +761,35 @@ the item at index *before*. See `Add` for a description of the parameters.", ""
}
// virtual wxSizerItem* InsertSpacer(size_t index, int size);
// virtual wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
DocAStr(InsertF,
"InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem",
"Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.", "");
wxSizerItem* InsertF(int before, PyObject* item, wxSizerFlags& flags) {
wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( info.sizer )
PyObject_SetAttrString(item,"thisown",Py_False);
wxPyEndBlockThreads(blocked);
// Now call the real Insert method if a valid item type was found
if ( info.window )
return self->Insert(before, info.window, flags);
else if ( info.sizer )
return self->Insert(before, info.sizer, flags);
else if (info.gotSize)
return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
flags.GetProportion(),
flags.GetFlags(),
flags.GetBorderInPixels());
else
return NULL;
}
DocAStr(Prepend,
"Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -619,10 +821,36 @@ this sizer. See `Add` for a description of the parameters.", "");
return NULL;
}
// virtual wxSizerItem* PrependSpacer(int size);
// virtual wxSizerItem* PrependStretchSpacer(int prop = 1);
DocAStr(PrependF,
"PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem",
"Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.", "");
wxSizerItem* PrependF(PyObject* item, wxSizerFlags& flags) {
wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( info.sizer )
PyObject_SetAttrString(item,"thisown",Py_False);
wxPyEndBlockThreads(blocked);
// Now call the real Add method if a valid item type was found
if ( info.window )
return self->Prepend(info.window, flags);
else if ( info.sizer )
return self->Prepend(info.sizer, flags);
else if (info.gotSize)
return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
flags.GetProportion(),
flags.GetFlags(),
flags.GetBorderInPixels());
else
return NULL;
}
DocAStr(Remove,
"Remove(self, item) -> bool",
"Removes an item from the sizer and destroys it. This method does not
@@ -642,7 +870,7 @@ and removed.", "
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked);
if ( info.window )
return self->Remove(info.window);
return false; //self->Remove(info.window);
else if ( info.sizer )
return self->Remove(info.sizer);
else if ( info.gotPos )
@@ -675,18 +903,18 @@ was found and detached.", "");
DocAStr(GetItem,
"GetItem(self, item) -> wx.SizerItem",
"GetItem(self, item, recursive=False) -> wx.SizerItem",
"Returns the `wx.SizerItem` which holds the *item* given. The *item*
parameter can be either a window, a sizer, or the zero-based index of
the item to be found.", "");
wxSizerItem* GetItem(PyObject* item) {
wxSizerItem* GetItem(PyObject* item, bool recursive=false) {
wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked);
if ( info.window )
return self->GetItem(info.window);
return self->GetItem(info.window, recursive);
else if ( info.sizer )
return self->GetItem(info.sizer);
return self->GetItem(info.sizer, recursive);
else if ( info.gotPos )
return self->GetItem(info.pos);
else
@@ -731,9 +959,9 @@ the item to be found.", "");
"""
if isinstance(olditem, wx.Window):
return self._ReplaceWin(olditem, item, recursive)
elif isinstnace(olditem, wx.Sizer):
elif isinstance(olditem, wx.Sizer):
return self._ReplaceSizer(olditem, item, recursive)
elif isinstnace(olditem, int):
elif isinstance(olditem, int):
return self._ReplaceItem(olditem, item)
else:
raise TypeError("Expected Window, Sizer, or integer for first parameter.")
wxPython/src/_stockobjs.i
-25
View File
@@ -198,14 +198,6 @@ class wxPenList : public wxGDIObjListBase {
public:
wxPen* FindOrCreatePen(const wxColour& colour, int width, int style);
void AddPen(wxPen* pen);
void RemovePen(wxPen* pen);
%pythoncode {
AddPen = wx._deprecated(AddPen)
RemovePen = wx._deprecated(RemovePen)
}
// int GetCount();
};
@@ -213,14 +205,6 @@ class wxBrushList : public wxGDIObjListBase {
public:
wxBrush * FindOrCreateBrush(const wxColour& colour, int style=wxSOLID);
void AddBrush(wxBrush *brush);
void RemoveBrush(wxBrush *brush);
%pythoncode {
AddBrush = wx._deprecated(AddBrush)
RemoveBrush = wx._deprecated(RemoveBrush)
}
// int GetCount();
};
@@ -231,15 +215,6 @@ public:
bool underline = false,
const wxString& facename = wxPyEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
void AddFont(wxFont* font);
void RemoveFont(wxFont *font);
%pythoncode {
AddFont = wx._deprecated(AddFont)
RemoveFont = wx._deprecated(RemoveFont)
}
// int GetCount();
};
//---------------------------------------------------------------------------
wxPython/src/_textctrl.i
+6
View File
@@ -70,6 +70,12 @@ enum {
%pythoncode { TE_LINEWRAP = TE_CHARWRAP }
// deprecated synonymns
%pythoncode {
PROCESS_ENTER = TE_PROCESS_ENTER
PASSWORD = TE_PASSWORD
}
enum wxTextAttrAlignment
wxPython/src/_toolbar.i
+4 -2
View File
@@ -325,8 +325,10 @@ public:
%Rename(AddToolItem, wxToolBarToolBase*, AddTool (wxToolBarToolBase *tool));
%Rename(InsertToolItem, wxToolBarToolBase*, InsertTool (size_t pos, wxToolBarToolBase *tool));
wxToolBarToolBase *AddControl(wxControl *control);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
wxToolBarToolBase *AddControl(wxControl *control,
const wxString& label = wxEmptyString);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control,
const wxString& label = wxEmptyString);
wxControl *FindControl( int id );
wxToolBarToolBase *AddSeparator();
wxPython/src/_toplvl.i
+13 -9
View File
@@ -30,13 +30,11 @@ enum
wxMINIMIZE,
wxMAXIMIZE,
wxCLOSE_BOX,
wxTHICK_FRAME,
wxSYSTEM_MENU,
wxMINIMIZE_BOX,
wxMAXIMIZE_BOX,
wxTINY_CAPTION_HORIZ,
wxTINY_CAPTION_VERT,
wxRESIZE_BOX,
wxRESIZE_BORDER,
wxDIALOG_NO_PARENT,
@@ -54,16 +52,22 @@ enum
wxFRAME_EX_METAL,
wxDIALOG_EX_METAL,
wxWS_EX_CONTEXTHELP,
// Obsolete
wxDIALOG_MODAL,
wxDIALOG_MODELESS,
wxUSER_COLOURS,
wxNO_3D,
wxFRAME_EX_CONTEXTHELP,
wxDIALOG_EX_CONTEXTHELP,
};
};
%pythoncode {
%# deprecated
RESIZE_BOX = MAXIMIZE_BOX
THICK_FRAME = RESIZE_BORDER
%# Obsolete
wxDIALOG_MODAL = 0
wxDIALOG_MODELESS = 0
wxUSER_COLOURS = 0
wxNO_3D = 0
}
enum
wxPython/src/_vscroll.i
+3
View File
@@ -469,6 +469,9 @@ public:
// change the background colour of the selected cells
void SetSelectionBackground(const wxColour& col);
// refreshes only the selected items
void RefreshSelected();
virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
wxPython/src/_window.i
+39 -4
View File
@@ -775,7 +775,16 @@ window had already been in the specified state.", "");
DocDeclStr(
bool , IsEnabled() const,
"Returns true if the window is enabled for input, false otherwise.", "");
"Returns true if the window is enabled for input, false otherwise.
This method takes into account the enabled state of parent windows up
to the top-level window.", "");
DocDeclStr(
bool , IsThisEnabled() const,
"Returns the internal enabled state independent of the parent(s) state,
i.e. the state in which the window would be if all of its parents are
enabled. Use `IsEnabled` to get the effective window state.", "");
DocDeclStr(
virtual bool , IsShownOnScreen() const,
@@ -892,6 +901,12 @@ or None.", "");
"Can this window have focus?", "");
DocDeclStr(
bool , CanAcceptFocus() const,
"Can this window have focus right now?", "");
DocDeclStr(
virtual bool , AcceptsFocusFromKeyboard() const,
"Can this window be given focus by keyboard navigation? if not, the
@@ -899,13 +914,24 @@ only way to give it focus (provided it accepts it at all) is to click
it.", "");
DocDeclStr(
bool , CanAcceptFocusFromKeyboard() const,
"Can this window be assigned focus from keyboard right now?", "");
DocDeclAStr(
virtual bool , NavigateIn(int flags = wxNavigationKeyEvent::IsForward),
"NavigateIn(self, int flags=NavigationKeyEvent.IsForward) -> bool",
"Navigates inside this window.", "");
DocDeclAStr(
virtual bool , Navigate(int flags = wxNavigationKeyEvent::IsForward),
"Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool",
"Does keyboard navigation from this window to another, by sending a
`wx.NavigationKeyEvent`.", "
"Does keyboard navigation starting from this window to another. This is
equivalient to self.GetParent().NavigateIn().", "
:param flags: A combination of the ``IsForward`` or ``IsBackward``
and the ``WinChange`` values in the `wx.NavigationKeyEvent`
@@ -973,8 +999,16 @@ do not change.", "");
wxWindow *, GetGrandParent() const,
"Returns the parent of the parent of this window, or None if there
isn't one.", "");
%extend {
DocDeclStr(wxWindow *, GetTopLevelParent(),
"Returns the first frame or dialog in this window's parental hierarchy.", "")
{
return wxGetTopLevelParent(self);
}
}
DocDeclStr(
virtual bool , IsTopLevel() const,
@@ -2114,6 +2148,7 @@ opaque.", "");
%property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");
%property(ForegroundColour, GetForegroundColour, SetForegroundColour, doc="See `GetForegroundColour` and `SetForegroundColour`");
%property(GrandParent, GetGrandParent, doc="See `GetGrandParent`");
%property(TopLevelParent, GetTopLevelParent, doc="See `GetTopLevelParent`");
%property(Handle, GetHandle, doc="See `GetHandle`");
%property(HelpText, GetHelpText, SetHelpText, doc="See `GetHelpText` and `SetHelpText`");
%property(Id, GetId, SetId, doc="See `GetId` and `SetId`");
wxPython/src/aui.i
+38 -1
View File
@@ -202,6 +202,11 @@ The following example shows a simple implementation that utilizes
%ignore wxAuiMDIParentFrame::~wxAuiMDIParentFrame;
%rename(PreAuiMDIParentFrame) wxAuiMDIParentFrame::wxAuiMDIParentFrame();
// Ignore these for now because they need a typemap for the return value, see below.
%ignore wxAuiMDIParentFrame::GetNotebook;
%ignore wxAuiMDIParentFrame::GetActiveChild;
%ignore wxAuiMDIParentFrame::GetClientWindow;
%pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame "self._setOORInfo(self)";
%pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame() "val._setOORInfo(val)";
%ignore wxAuiMDIChildFrame::~wxAuiMDIChildFrame;
@@ -213,6 +218,8 @@ The following example shows a simple implementation that utilizes
%rename(PreAuiMDIClientWindow) wxAuiMDIClientWindow::wxAuiMDIClientWindow();
%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
//---------------------------------------------------------------------------
// Get all our defs from the REAL header files.
@@ -300,6 +307,36 @@ The following example shows a simple implementation that utilizes
~wxAuiPaneButton() {}
}
%extend wxAuiMDIParentFrame {
%typemap(out) wxAuiNotebook* { $result = wxPyMake_wxObject($1, $owner); }
%typemap(out) wxAuiMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); }
%typemap(out) wxAuiMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); }
%rename(GetNotebook) _GetNotebook;
%rename(GetActiveChild) _GetActiveChild;
%rename(GetClientWindow) _GetClientWindow;
wxAuiNotebook* _GetNotebook() const
{
return self->GetNotebook();
}
wxAuiMDIChildFrame* _GetActiveChild() const
{
return self->GetActiveChild();
}
wxAuiMDIClientWindow* _GetClientWindow() const
{
return self->GetClientWindow();
}
%typemap(out) wxAuiNotebook*;
%typemap(out) wxAuiMDIChildFrame*;
%typemap(out) wxAuiMDIClientWindow*;
}
//---------------------------------------------------------------------------
%{
@@ -482,7 +519,7 @@ class wxPyAuiDockArt : public wxAuiDefaultDockArt
{
public:
%pythonAppend wxPyAuiDockArt setCallbackInfo(PyAuiDockArt)
wxPyAuiDocArt();
wxPyAuiDockArt();
};
wxPython/src/combo.i
+7
View File
@@ -49,6 +49,13 @@ enum {
wxCC_POPUP_ON_MOUSE_UP = 0x0002,
// All text is not automatically selected on click
wxCC_NO_TEXT_AUTO_SELECT = 0x0004,
// Drop-button stays down as long as popup is displayed.
wxCC_BUTTON_STAYS_DOWN = 0x0008,
// Drop-button covers the entire control.
wxCC_FULL_BUTTON = 0x0010,
// Drop-button goes over the custom-border (used under WinVista).
wxCC_BUTTON_COVERS_BORDER = 0x0020,
};
wxPython/src/grid.i
+31
View File
@@ -455,6 +455,20 @@ class wxGridCellAttr;
#define wxGRID_VALUE_DATETIME "datetime"
// magic constant which tells (to some functions) to automatically calculate
// the appropriate size
enum { wxGRID_AUTOSIZE };
// many wxGrid methods work either with columns or rows, this enum is used for
// the parameter indicating which one should it be
enum wxGridDirection
{
wxGRID_COLUMN,
wxGRID_ROW
};
%immutable;
const wxGridCellCoords wxGridNoCellCoords;
const wxRect wxGridNoCellRect;
@@ -2143,6 +2157,23 @@ public:
};
// ----------------------------------------------------------------------------
// wxGridUpdateLocker prevents updates to a grid during its lifetime
// ----------------------------------------------------------------------------
class wxGridUpdateLocker
{
public:
// if the pointer is NULL, Create() can be called later
wxGridUpdateLocker(wxGrid *grid = NULL);
~wxGridUpdateLocker();
// can be called if ctor was used with a NULL pointer, must not be called
// more than once
void Create(wxGrid *grid);
};
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Grid events and stuff
wxPython/src/gtk/_controls.py
+5 -2
View File
@@ -1500,6 +1500,9 @@ TE_BESTWRAP = _controls_.TE_BESTWRAP
TE_RICH2 = _controls_.TE_RICH2
TE_CAPITALIZE = _controls_.TE_CAPITALIZE
TE_LINEWRAP = TE_CHARWRAP
PROCESS_ENTER = TE_PROCESS_ENTER
PASSWORD = TE_PASSWORD
TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
@@ -3778,11 +3781,11 @@ class ToolBarBase(_core.Control):
return _controls_.ToolBarBase_InsertToolItem(*args, **kwargs)
def AddControl(*args, **kwargs):
"""AddControl(self, Control control) -> ToolBarToolBase"""
"""AddControl(self, Control control, String label=wxEmptyString) -> ToolBarToolBase"""
return _controls_.ToolBarBase_AddControl(*args, **kwargs)
def InsertControl(*args, **kwargs):
"""InsertControl(self, size_t pos, Control control) -> ToolBarToolBase"""
"""InsertControl(self, size_t pos, Control control, String label=wxEmptyString) -> ToolBarToolBase"""
return _controls_.ToolBarBase_InsertControl(*args, **kwargs)
def FindControl(*args, **kwargs):
wxPython/src/gtk/_controls_wrap.cpp
+44 -6
View File
@@ -24263,18 +24263,22 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_AddControl(PyObject *SWIGUNUSEDPARM(self)
PyObject *resultobj = 0;
wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
wxControl *arg2 = (wxControl *) 0 ;
wxString const &arg3_defvalue = wxEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
wxToolBarToolBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
bool temp3 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "control", NULL
(char *) "self",(char *) "control",(char *) "label", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_AddControl",kwnames,&obj0,&obj1)) SWIG_fail;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ToolBarBase_AddControl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBarBase, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBarBase_AddControl" "', expected argument " "1"" of type '" "wxToolBarBase *""'");
@@ -24285,17 +24289,32 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_AddControl(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ToolBarBase_AddControl" "', expected argument " "2"" of type '" "wxControl *""'");
}
arg2 = reinterpret_cast< wxControl * >(argp2);
if (obj2) {
{
arg3 = wxString_in_helper(obj2);
if (arg3 == NULL) SWIG_fail;
temp3 = true;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxToolBarToolBase *)(arg1)->AddControl(arg2);
result = (wxToolBarToolBase *)(arg1)->AddControl(arg2,(wxString const &)*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
{
if (temp3)
delete arg3;
}
return resultobj;
fail:
{
if (temp3)
delete arg3;
}
return NULL;
}
@@ -24305,6 +24324,8 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
size_t arg2 ;
wxControl *arg3 = (wxControl *) 0 ;
wxString const &arg4_defvalue = wxEmptyString ;
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxToolBarToolBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -24312,14 +24333,16 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
int ecode2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
bool temp4 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "pos",(char *) "control", NULL
(char *) "self",(char *) "pos",(char *) "control",(char *) "label", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBarBase, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBarBase_InsertControl" "', expected argument " "1"" of type '" "wxToolBarBase *""'");
@@ -24335,17 +24358,32 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBarBase_InsertControl" "', expected argument " "3"" of type '" "wxControl *""'");
}
arg3 = reinterpret_cast< wxControl * >(argp3);
if (obj3) {
{
arg4 = wxString_in_helper(obj3);
if (arg4 == NULL) SWIG_fail;
temp4 = true;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxToolBarToolBase *)(arg1)->InsertControl(arg2,arg3);
result = (wxToolBarToolBase *)(arg1)->InsertControl(arg2,arg3,(wxString const &)*arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
{
if (temp4)
delete arg4;
}
return resultobj;
fail:
{
if (temp4)
delete arg4;
}
return NULL;
}
wxPython/src/gtk/_core.py
+294 -15
View File
@@ -116,8 +116,6 @@ LB_MULTIPLE = _core_.LB_MULTIPLE
LB_EXTENDED = _core_.LB_EXTENDED
LB_OWNERDRAW = _core_.LB_OWNERDRAW
LB_HSCROLL = _core_.LB_HSCROLL
PROCESS_ENTER = _core_.PROCESS_ENTER
PASSWORD = _core_.PASSWORD
CB_SIMPLE = _core_.CB_SIMPLE
CB_DROPDOWN = _core_.CB_DROPDOWN
CB_SORT = _core_.CB_SORT
@@ -334,7 +332,7 @@ EXPAND = _core_.EXPAND
SHAPED = _core_.SHAPED
FIXED_MINSIZE = _core_.FIXED_MINSIZE
TILE = _core_.TILE
ADJUST_MINSIZE = _core_.ADJUST_MINSIZE
ADJUST_MINSIZE = 0
BORDER_DEFAULT = _core_.BORDER_DEFAULT
BORDER_NONE = _core_.BORDER_NONE
BORDER_STATIC = _core_.BORDER_STATIC
@@ -416,8 +414,6 @@ WXK_CONTROL = _core_.WXK_CONTROL
WXK_MENU = _core_.WXK_MENU
WXK_PAUSE = _core_.WXK_PAUSE
WXK_CAPITAL = _core_.WXK_CAPITAL
WXK_PRIOR = _core_.WXK_PRIOR
WXK_NEXT = _core_.WXK_NEXT
WXK_END = _core_.WXK_END
WXK_HOME = _core_.WXK_HOME
WXK_LEFT = _core_.WXK_LEFT
@@ -486,9 +482,7 @@ WXK_NUMPAD_LEFT = _core_.WXK_NUMPAD_LEFT
WXK_NUMPAD_UP = _core_.WXK_NUMPAD_UP
WXK_NUMPAD_RIGHT = _core_.WXK_NUMPAD_RIGHT
WXK_NUMPAD_DOWN = _core_.WXK_NUMPAD_DOWN
WXK_NUMPAD_PRIOR = _core_.WXK_NUMPAD_PRIOR
WXK_NUMPAD_PAGEUP = _core_.WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = _core_.WXK_NUMPAD_NEXT
WXK_NUMPAD_PAGEDOWN = _core_.WXK_NUMPAD_PAGEDOWN
WXK_NUMPAD_END = _core_.WXK_NUMPAD_END
WXK_NUMPAD_BEGIN = _core_.WXK_NUMPAD_BEGIN
@@ -525,6 +519,11 @@ WXK_SPECIAL17 = _core_.WXK_SPECIAL17
WXK_SPECIAL18 = _core_.WXK_SPECIAL18
WXK_SPECIAL19 = _core_.WXK_SPECIAL19
WXK_SPECIAL20 = _core_.WXK_SPECIAL20
WXK_PRIOR = WXK_PAGEUP
WXK_NEXT = WXK_PAGEDOWN
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN
PAPER_NONE = _core_.PAPER_NONE
PAPER_LETTER = _core_.PAPER_LETTER
PAPER_LEGAL = _core_.PAPER_LEGAL
@@ -4581,7 +4580,7 @@ class ScrollEvent(CommandEvent):
"""
A scroll event holds information about events sent from stand-alone
scrollbars and sliders. Note that scrolled windows do not send
instnaces of this event class, but send the `wx.ScrollWinEvent`
instances of this event class, but send the `wx.ScrollWinEvent`
instead.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -8124,10 +8123,11 @@ class AcceleratorTable(Object):
Ok = IsOk
_core_.AcceleratorTable_swigregister(AcceleratorTable)
def GetAccelFromString(label):
entry = AcceleratorEntry()
entry.FromString(label)
return entry
def GetAccelFromString(*args, **kwargs):
"""GetAccelFromString(String label) -> AcceleratorEntry"""
return _core_.GetAccelFromString(*args, **kwargs)
#---------------------------------------------------------------------------
class VisualAttributes(object):
@@ -8909,9 +8909,21 @@ class Window(EvtHandler):
IsEnabled(self) -> bool
Returns true if the window is enabled for input, false otherwise.
This method takes into account the enabled state of parent windows up
to the top-level window.
"""
return _core_.Window_IsEnabled(*args, **kwargs)
def IsThisEnabled(*args, **kwargs):
"""
IsThisEnabled(self) -> bool
Returns the internal enabled state independent of the parent(s) state,
i.e. the state in which the window would be if all of its parents are
enabled. Use `IsEnabled` to get the effective window state.
"""
return _core_.Window_IsThisEnabled(*args, **kwargs)
def IsShownOnScreen(*args, **kwargs):
"""
IsShownOnScreen(self) -> bool
@@ -9056,6 +9068,14 @@ class Window(EvtHandler):
"""
return _core_.Window_AcceptsFocus(*args, **kwargs)
def CanAcceptFocus(*args, **kwargs):
"""
CanAcceptFocus(self) -> bool
Can this window have focus right now?
"""
return _core_.Window_CanAcceptFocus(*args, **kwargs)
def AcceptsFocusFromKeyboard(*args, **kwargs):
"""
AcceptsFocusFromKeyboard(self) -> bool
@@ -9066,6 +9086,14 @@ class Window(EvtHandler):
"""
return _core_.Window_AcceptsFocusFromKeyboard(*args, **kwargs)
def CanAcceptFocusFromKeyboard(*args, **kwargs):
"""
CanAcceptFocusFromKeyboard(self) -> bool
Can this window be assigned focus from keyboard right now?
"""
return _core_.Window_CanAcceptFocusFromKeyboard(*args, **kwargs)
def Navigate(*args, **kwargs):
"""
Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool
@@ -9127,6 +9155,14 @@ class Window(EvtHandler):
"""
return _core_.Window_GetGrandParent(*args, **kwargs)
def GetTopLevelParent(*args, **kwargs):
"""
GetTopLevelParent(self) -> Window
Returns the first frame or dialog in this window's parental hierarchy.
"""
return _core_.Window_GetTopLevelParent(*args, **kwargs)
def IsTopLevel(*args, **kwargs):
"""
IsTopLevel(self) -> bool
@@ -10423,6 +10459,7 @@ class Window(EvtHandler):
Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`")
ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`")
GrandParent = property(GetGrandParent,doc="See `GetGrandParent`")
TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`")
Handle = property(GetHandle,doc="See `GetHandle`")
HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`")
Id = property(GetId,SetId,doc="See `GetId` and `SetId`")
@@ -11066,7 +11103,6 @@ class MenuBar(Window):
self.Append(m, l)
Frame = property(GetFrame,doc="See `GetFrame`")
Menu = property(GetMenu,doc="See `GetMenu`")
MenuCount = property(GetMenuCount,doc="See `GetMenuCount`")
Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`")
_core_.MenuBar_swigregister(MenuBar)
@@ -11601,6 +11637,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems)
#---------------------------------------------------------------------------
class SizerFlags(object):
"""
Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
to specify a lot of flags and parameters which can be unwieldy. This
is where wx.SizerFlags comes in: it allows you to specify all
parameters using the named methods instead. For example, instead of::
sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
you can now write::
sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
This is more readable and also allows you to create wx.SizerFlags
objects which can be reused for several sizer items.::
flagsExpand = wx.SizerFlags(1)
flagsExpand.Expand().Border(wx.ALL, 10)
sizer.AddF(ctrl1, flagsExpand)
sizer.AddF(ctrl2, flagsExpand)
Note that by specification, all methods of wx.SizerFlags return the
wx.SizerFlags object itself allowing chaining multiple method calls
like in the examples above.
"""
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 proportion=0) -> SizerFlags
Constructs the flags object with the specified proportion.
"""
_core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs))
__swig_destroy__ = _core_.delete_SizerFlags
__del__ = lambda self : None;
def Proportion(*args, **kwargs):
"""
Proportion(self, int proportion) -> SizerFlags
Sets the item's proportion value.
"""
return _core_.SizerFlags_Proportion(*args, **kwargs)
def Align(*args, **kwargs):
"""
Align(self, int alignment) -> SizerFlags
Sets the item's alignment
"""
return _core_.SizerFlags_Align(*args, **kwargs)
def Expand(*args, **kwargs):
"""
Expand(self) -> SizerFlags
Sets the wx.EXPAND flag, which will cause the item to be expanded to
fill as much space as it is given by the sizer.
"""
return _core_.SizerFlags_Expand(*args, **kwargs)
def Centre(*args, **kwargs):
"""
Centre(self) -> SizerFlags
Same as `Center` for those with an alternate dialect of English.
"""
return _core_.SizerFlags_Centre(*args, **kwargs)
def Center(*args, **kwargs):
"""
Center(self) -> SizerFlags
Sets the centering alignment flags.
"""
return _core_.SizerFlags_Center(*args, **kwargs)
def Left(*args, **kwargs):
"""
Left(self) -> SizerFlags
Aligns the object to the left, a shortcut for calling
Align(wx.ALIGN_LEFT)
"""
return _core_.SizerFlags_Left(*args, **kwargs)
def Right(*args, **kwargs):
"""
Right(self) -> SizerFlags
Aligns the object to the right, a shortcut for calling
Align(wx.ALIGN_RIGHT)
"""
return _core_.SizerFlags_Right(*args, **kwargs)
def Top(*args, **kwargs):
"""
Top(self) -> SizerFlags
Aligns the object to the top of the available space, a shortcut for
calling Align(wx.ALIGN_TOP)
"""
return _core_.SizerFlags_Top(*args, **kwargs)
def Bottom(*args, **kwargs):
"""
Bottom(self) -> SizerFlags
Aligns the object to the bottom of the available space, a shortcut for
calling Align(wx.ALIGN_BOTTOM)
"""
return _core_.SizerFlags_Bottom(*args, **kwargs)
def Shaped(*args, **kwargs):
"""
Shaped(self) -> SizerFlags
Sets the wx.SHAPED flag.
"""
return _core_.SizerFlags_Shaped(*args, **kwargs)
def FixedMinSize(*args, **kwargs):
"""
FixedMinSize(self) -> SizerFlags
Sets the wx.FIXED_MINSIZE flag.
"""
return _core_.SizerFlags_FixedMinSize(*args, **kwargs)
def Border(*args, **kwargs):
"""
Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags
Sets the border of the item in the direction(s) or sides given by the
direction parameter. If the borderInPixels value is not given then
the default border size (see `GetDefaultBorder`) will be used.
"""
return _core_.SizerFlags_Border(*args, **kwargs)
def DoubleBorder(*args, **kwargs):
"""
DoubleBorder(self, int direction=ALL) -> SizerFlags
Sets the border in the given direction to twice the default border
size.
"""
return _core_.SizerFlags_DoubleBorder(*args, **kwargs)
def TripleBorder(*args, **kwargs):
"""
TripleBorder(self, int direction=ALL) -> SizerFlags
Sets the border in the given direction to three times the default
border size.
"""
return _core_.SizerFlags_TripleBorder(*args, **kwargs)
def HorzBorder(*args, **kwargs):
"""
HorzBorder(self) -> SizerFlags
Sets the left and right borders to the default border size.
"""
return _core_.SizerFlags_HorzBorder(*args, **kwargs)
def DoubleHorzBorder(*args, **kwargs):
"""
DoubleHorzBorder(self) -> SizerFlags
Sets the left and right borders to twice the default border size.
"""
return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs)
def GetDefaultBorder(*args, **kwargs):
"""
GetDefaultBorder() -> int
Returns the default border size used by the other border methods
"""
return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs)
GetDefaultBorder = staticmethod(GetDefaultBorder)
def GetProportion(*args, **kwargs):
"""
GetProportion(self) -> int
Returns the proportion value to be used in the sizer item.
"""
return _core_.SizerFlags_GetProportion(*args, **kwargs)
def GetFlags(*args, **kwargs):
"""
GetFlags(self) -> int
Returns the flags value to be used in the sizer item.
"""
return _core_.SizerFlags_GetFlags(*args, **kwargs)
def GetBorderInPixels(*args, **kwargs):
"""
GetBorderInPixels(self) -> int
Returns the border value in pixels to be used in the sizer item.
"""
return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs)
_core_.SizerFlags_swigregister(SizerFlags)
def SizerFlags_GetDefaultBorder(*args):
"""
SizerFlags_GetDefaultBorder() -> int
Returns the default border size used by the other border methods
"""
return _core_.SizerFlags_GetDefaultBorder(*args)
class SizerItem(Object):
"""
The wx.SizerItem class is used to track the position, size and other
@@ -11996,6 +12248,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Add(*args, **kwargs)
def AddF(*args, **kwargs):
"""
AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Add` but uses the `wx.SizerFlags` convenience class for
setting the various flags, options and borders.
"""
return _core_.Sizer_AddF(*args, **kwargs)
def Insert(*args, **kwargs):
"""
Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -12006,6 +12267,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Insert(*args, **kwargs)
def InsertF(*args, **kwargs):
"""
InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.
"""
return _core_.Sizer_InsertF(*args, **kwargs)
def Prepend(*args, **kwargs):
"""
Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -12016,6 +12286,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Prepend(*args, **kwargs)
def PrependF(*args, **kwargs):
"""
PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.
"""
return _core_.Sizer_PrependF(*args, **kwargs)
def Remove(*args, **kwargs):
"""
Remove(self, item) -> bool
@@ -12043,7 +12322,7 @@ class Sizer(Object):
def GetItem(*args, **kwargs):
"""
GetItem(self, item) -> wx.SizerItem
GetItem(self, item, recursive=False) -> wx.SizerItem
Returns the `wx.SizerItem` which holds the *item* given. The *item*
parameter can be either a window, a sizer, or the zero-based index of
@@ -12083,9 +12362,9 @@ class Sizer(Object):
"""
if isinstance(olditem, wx.Window):
return self._ReplaceWin(olditem, item, recursive)
elif isinstnace(olditem, wx.Sizer):
elif isinstance(olditem, wx.Sizer):
return self._ReplaceSizer(olditem, item, recursive)
elif isinstnace(olditem, int):
elif isinstance(olditem, int):
return self._ReplaceItem(olditem, item)
else:
raise TypeError("Expected Window, Sizer, or integer for first parameter.")
wxPython/src/gtk/_core_wrap.cpp
+1324 -213
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/_gdi.py
+41 -40
View File
@@ -673,7 +673,7 @@ class Bitmap(GDIObject):
CopyFromBuffer(self, buffer data)
Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more .
See `wx.BitmapFromBuffer` for more .
"""
return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
@@ -682,7 +682,7 @@ class Bitmap(GDIObject):
CopyFromBufferRGBA(self, buffer data)
Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more .
See `wx.BitmapFromBufferRGBA` for more .
"""
return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
@@ -3385,6 +3385,35 @@ class DC(_core.Object):
"""
return _gdi_.DC_BlitPointSize(*args, **kwargs)
def StretchBlit(*args, **kwargs):
"""
StretchBlit(self, int dstX, int dstY, int dstWidth, int dstHeight, DC source,
int srcX, int srcY, int srcWidth, int srcHeight,
int rop=COPY, bool useMask=False,
int srcMaskX=wxDefaultCoord, int srcMaskY=wxDefaultCoord) -> bool
Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position.
"""
return _gdi_.DC_StretchBlit(*args, **kwargs)
def StretchBlitPointSize(*args, **kwargs):
"""
StretchBlitPointSize(self, Point dstPt, Size dstSize, DC source, Point srcPt,
Size srcSize, int rop=COPY, bool useMask=False,
Point srcMaskPt=DefaultPosition) -> bool
Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position. This version is the same as `StretchBlit`
except `wx.Point` and `wx.Size` objects are used instead of individual
position and size components.
"""
return _gdi_.DC_StretchBlitPointSize(*args, **kwargs)
def GetAsBitmap(*args, **kwargs):
"""GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
return _gdi_.DC_GetAsBitmap(*args, **kwargs)
@@ -4693,6 +4722,7 @@ def MemoryDCFromDC(*args, **kwargs):
BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA
BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA
BUFFER_USES_SHARED_BUFFER = _gdi_.BUFFER_USES_SHARED_BUFFER
class BufferedDC(MemoryDC):
"""
This simple class provides a simple way to avoid flicker: when drawing
@@ -5391,7 +5421,8 @@ class GraphicsContext(GraphicsObject):
Creates a wx.GraphicsContext from a native context. This native
context must be eg a CGContextRef for Core Graphics, a Graphics
pointer for GDIPlus or a cairo_t pointer for Cairo.
pointer for GDIPlus or a cairo_t pointer for Cairo. NOTE: For
wxPython we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
@@ -5400,7 +5431,8 @@ class GraphicsContext(GraphicsObject):
"""
CreateFromNativeWindow(void window) -> GraphicsContext
Creates a wx.GraphicsContext from a native window.
Creates a wx.GraphicsContext from a native window. NOTE: For wxPython
we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
@@ -5719,7 +5751,7 @@ class GraphicsContext(GraphicsObject):
def StrokeLineSegements(*args, **kwargs):
"""
StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
StrokeLineSegments(self, List beginPoints, List endPoints)
Stroke disconnected lines from begin to end points
"""
@@ -5800,7 +5832,8 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
Creates a wx.GraphicsContext from a native context. This native
context must be eg a CGContextRef for Core Graphics, a Graphics
pointer for GDIPlus or a cairo_t pointer for Cairo.
pointer for GDIPlus or a cairo_t pointer for Cairo. NOTE: For
wxPython we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
@@ -5808,7 +5841,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
"""
GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
Creates a wx.GraphicsContext from a native window.
Creates a wx.GraphicsContext from a native window. NOTE: For wxPython
we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
@@ -6238,17 +6272,6 @@ class PenList(GDIObjListBase):
"""FindOrCreatePen(self, Colour colour, int width, int style) -> Pen"""
return _gdi_.PenList_FindOrCreatePen(*args, **kwargs)
def AddPen(*args, **kwargs):
"""AddPen(self, Pen pen)"""
return _gdi_.PenList_AddPen(*args, **kwargs)
def RemovePen(*args, **kwargs):
"""RemovePen(self, Pen pen)"""
return _gdi_.PenList_RemovePen(*args, **kwargs)
AddPen = wx._deprecated(AddPen)
RemovePen = wx._deprecated(RemovePen)
_gdi_.PenList_swigregister(PenList)
class BrushList(GDIObjListBase):
@@ -6260,17 +6283,6 @@ class BrushList(GDIObjListBase):
"""FindOrCreateBrush(self, Colour colour, int style=SOLID) -> Brush"""
return _gdi_.BrushList_FindOrCreateBrush(*args, **kwargs)
def AddBrush(*args, **kwargs):
"""AddBrush(self, Brush brush)"""
return _gdi_.BrushList_AddBrush(*args, **kwargs)
def RemoveBrush(*args, **kwargs):
"""RemoveBrush(self, Brush brush)"""
return _gdi_.BrushList_RemoveBrush(*args, **kwargs)
AddBrush = wx._deprecated(AddBrush)
RemoveBrush = wx._deprecated(RemoveBrush)
_gdi_.BrushList_swigregister(BrushList)
class FontList(GDIObjListBase):
@@ -6286,17 +6298,6 @@ class FontList(GDIObjListBase):
"""
return _gdi_.FontList_FindOrCreateFont(*args, **kwargs)
def AddFont(*args, **kwargs):
"""AddFont(self, Font font)"""
return _gdi_.FontList_AddFont(*args, **kwargs)
def RemoveFont(*args, **kwargs):
"""RemoveFont(self, Font font)"""
return _gdi_.FontList_RemoveFont(*args, **kwargs)
AddFont = wx._deprecated(AddFont)
RemoveFont = wx._deprecated(RemoveFont)
_gdi_.FontList_swigregister(FontList)
class ColourDatabase(object):
wxPython/src/gtk/_gdi_wrap.cpp
+275 -248
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/_misc.py
+18 -21
View File
@@ -316,11 +316,6 @@ def EndBusyCursor(*args):
"""EndBusyCursor()"""
return _misc_.EndBusyCursor(*args)
def GetElapsedTime(*args, **kwargs):
"""GetElapsedTime(bool resetTimer=True) -> long"""
return _misc_.GetElapsedTime(*args, **kwargs)
GetElapsedTime = wx._deprecated(GetElapsedTime)
def IsBusy(*args):
"""IsBusy() -> bool"""
return _misc_.IsBusy(*args)
@@ -333,10 +328,6 @@ def Shell(*args, **kwargs):
"""Shell(String command=EmptyString) -> bool"""
return _misc_.Shell(*args, **kwargs)
def StartTimer(*args):
"""StartTimer()"""
return _misc_.StartTimer(*args)
def GetOsVersion(*args):
"""GetOsVersion() -> (platform, major, minor)"""
return _misc_.GetOsVersion(*args)
@@ -3307,8 +3298,26 @@ class FileConfig(ConfigBase):
_misc_.FileConfig_swiginit(self,_misc_.new_FileConfig(*args, **kwargs))
__swig_destroy__ = _misc_.delete_FileConfig
__del__ = lambda self : None;
def GetGlobalFileName(*args, **kwargs):
"""GetGlobalFileName(String szFile) -> String"""
return _misc_.FileConfig_GetGlobalFileName(*args, **kwargs)
GetGlobalFileName = staticmethod(GetGlobalFileName)
def GetLocalFileName(*args, **kwargs):
"""GetLocalFileName(String szFile, int style=0) -> String"""
return _misc_.FileConfig_GetLocalFileName(*args, **kwargs)
GetLocalFileName = staticmethod(GetLocalFileName)
_misc_.FileConfig_swigregister(FileConfig)
def FileConfig_GetGlobalFileName(*args, **kwargs):
"""FileConfig_GetGlobalFileName(String szFile) -> String"""
return _misc_.FileConfig_GetGlobalFileName(*args, **kwargs)
def FileConfig_GetLocalFileName(*args, **kwargs):
"""FileConfig_GetLocalFileName(String szFile, int style=0) -> String"""
return _misc_.FileConfig_GetLocalFileName(*args, **kwargs)
class ConfigPathChanger(object):
"""
A handy little class which changes current path to the path of given
@@ -3707,17 +3716,6 @@ class DateTime(object):
"""GetLastWeekDay(self, int weekday, int month=Inv_Month, int year=Inv_Year) -> DateTime"""
return _misc_.DateTime_GetLastWeekDay(*args, **kwargs)
def SetToTheWeek(*args, **kwargs):
"""SetToTheWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> bool"""
return _misc_.DateTime_SetToTheWeek(*args, **kwargs)
def GetWeek(*args, **kwargs):
"""GetWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> DateTime"""
return _misc_.DateTime_GetWeek(*args, **kwargs)
SetToTheWeek = wx._deprecated(SetToTheWeek, "SetToTheWeek is deprecated, use (static) SetToWeekOfYear instead")
GetWeek = wx._deprecated(GetWeek, "GetWeek is deprecated, use GetWeekOfYear instead")
def SetToWeekOfYear(*args, **kwargs):
"""SetToWeekOfYear(int year, int numWeek, int weekday=Mon) -> DateTime"""
return _misc_.DateTime_SetToWeekOfYear(*args, **kwargs)
@@ -4036,7 +4034,6 @@ class DateTime(object):
RataDie = property(GetRataDie,doc="See `GetRataDie`")
Second = property(GetSecond,SetSecond,doc="See `GetSecond` and `SetSecond`")
Ticks = property(GetTicks,doc="See `GetTicks`")
Week = property(GetWeek,doc="See `GetWeek`")
WeekDay = property(GetWeekDay,doc="See `GetWeekDay`")
WeekDayInSameWeek = property(GetWeekDayInSameWeek,doc="See `GetWeekDayInSameWeek`")
WeekOfMonth = property(GetWeekOfMonth,doc="See `GetWeekOfMonth`")
wxPython/src/gtk/_misc_wrap.cpp
+118 -196
View File
@@ -2801,6 +2801,23 @@ SWIG_AsVal_int (PyObject * obj, int *val)
static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr);
static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr);
wxMemorySize wxGetFreeMemory()
{ wxPyRaiseNotImplemented(); return 0; }
SWIGINTERN int
SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val)
{
long v = 0;
if (SWIG_AsVal_long(obj, &v) && v < 0) {
return SWIG_TypeError;
}
else if (val)
*val = (unsigned long)v;
return SWIG_OK;
}
SWIGINTERN int
SWIG_AsVal_bool (PyObject *obj, bool *val)
{
@@ -2819,23 +2836,6 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
}
wxMemorySize wxGetFreeMemory()
{ wxPyRaiseNotImplemented(); return 0; }
SWIGINTERN int
SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val)
{
long v = 0;
if (SWIG_AsVal_long(obj, &v) && v < 0) {
return SWIG_TypeError;
}
else if (val)
*val = (unsigned long)v;
return SWIG_OK;
}
SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
@@ -4937,38 +4937,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_GetElapsedTime(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
bool arg1 = (bool) true ;
long result;
bool val1 ;
int ecode1 = 0 ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "resetTimer", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:GetElapsedTime",kwnames,&obj0)) SWIG_fail;
if (obj0) {
ecode1 = SWIG_AsVal_bool(obj0, &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GetElapsedTime" "', expected argument " "1"" of type '" "bool""'");
}
arg1 = static_cast< bool >(val1);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)wxGetElapsedTime(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_IsBusy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
bool result;
@@ -5055,23 +5023,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_StartTimer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
if (!SWIG_Python_UnpackTuple(args,"StartTimer",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStartTimer();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_GetOsVersion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
int *arg1 = (int *) 0 ;
@@ -22974,6 +22925,103 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileConfig_GetGlobalFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
wxString result;
bool temp1 = false ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "szFile", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileConfig_GetGlobalFileName",kwnames,&obj0)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxFileConfig::GetGlobalFileName((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
#endif
}
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
SWIGINTERN PyObject *_wrap_FileConfig_GetLocalFileName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
int arg2 = (int) 0 ;
wxString result;
bool temp1 = false ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "szFile",(char *) "style", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FileConfig_GetLocalFileName",kwnames,&obj0,&obj1)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
}
if (obj1) {
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FileConfig_GetLocalFileName" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxFileConfig::GetLocalFileName((wxString const &)*arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
#endif
}
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
SWIGINTERN PyObject *FileConfig_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -25244,130 +25292,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_DateTime_SetToTheWeek(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxDateTime *arg1 = (wxDateTime *) 0 ;
int arg2 ;
wxDateTime::WeekDay arg3 = (wxDateTime::WeekDay) wxDateTime::Mon ;
wxDateTime::WeekFlags arg4 = (wxDateTime::WeekFlags) wxDateTime::Monday_First ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
int val3 ;
int ecode3 = 0 ;
int val4 ;
int ecode4 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToTheWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDateTime, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DateTime_SetToTheWeek" "', expected argument " "1"" of type '" "wxDateTime *""'");
}
arg1 = reinterpret_cast< wxDateTime * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DateTime_SetToTheWeek" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
if (obj2) {
ecode3 = SWIG_AsVal_int(obj2, &val3);
if (!SWIG_IsOK(ecode3)) {
SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DateTime_SetToTheWeek" "', expected argument " "3"" of type '" "wxDateTime::WeekDay""'");
}
arg3 = static_cast< wxDateTime::WeekDay >(val3);
}
if (obj3) {
ecode4 = SWIG_AsVal_int(obj3, &val4);
if (!SWIG_IsOK(ecode4)) {
SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DateTime_SetToTheWeek" "', expected argument " "4"" of type '" "wxDateTime::WeekFlags""'");
}
arg4 = static_cast< wxDateTime::WeekFlags >(val4);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->SetToTheWeek(arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_DateTime_GetWeek(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxDateTime *arg1 = (wxDateTime *) 0 ;
int arg2 ;
wxDateTime::WeekDay arg3 = (wxDateTime::WeekDay) wxDateTime::Mon ;
wxDateTime::WeekFlags arg4 = (wxDateTime::WeekFlags) wxDateTime::Monday_First ;
wxDateTime result;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
int val3 ;
int ecode3 = 0 ;
int val4 ;
int ecode4 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "numWeek",(char *) "weekday",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDateTime, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DateTime_GetWeek" "', expected argument " "1"" of type '" "wxDateTime *""'");
}
arg1 = reinterpret_cast< wxDateTime * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DateTime_GetWeek" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
if (obj2) {
ecode3 = SWIG_AsVal_int(obj2, &val3);
if (!SWIG_IsOK(ecode3)) {
SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DateTime_GetWeek" "', expected argument " "3"" of type '" "wxDateTime::WeekDay""'");
}
arg3 = static_cast< wxDateTime::WeekDay >(val3);
}
if (obj3) {
ecode4 = SWIG_AsVal_int(obj3, &val4);
if (!SWIG_IsOK(ecode4)) {
SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DateTime_GetWeek" "', expected argument " "4"" of type '" "wxDateTime::WeekFlags""'");
}
arg4 = static_cast< wxDateTime::WeekFlags >(val4);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->GetWeek(arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxDateTime(static_cast< const wxDateTime& >(result))), SWIGTYPE_p_wxDateTime, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_DateTime_SetToWeekOfYear(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
int arg1 ;
@@ -36547,12 +36471,12 @@ SWIGINTERN PyObject *_wrap_Display_GetFromWindow(PyObject *SWIGUNUSEDPARM(self),
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Display_GetFromWindow",kwnames,&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Display_GetFromWindow" "', expected argument " "1"" of type '" "wxWindow *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Display_GetFromWindow" "', expected argument " "1"" of type '" "wxWindow const *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)wxDisplay::GetFromWindow(arg1);
result = (int)wxDisplay::GetFromWindow((wxWindow const *)arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -39198,11 +39122,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"GetStockHelpString", (PyCFunction) _wrap_GetStockHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Bell", (PyCFunction)_wrap_Bell, METH_NOARGS, NULL},
{ (char *)"EndBusyCursor", (PyCFunction)_wrap_EndBusyCursor, METH_NOARGS, NULL},
{ (char *)"GetElapsedTime", (PyCFunction) _wrap_GetElapsedTime, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"IsBusy", (PyCFunction)_wrap_IsBusy, METH_NOARGS, NULL},
{ (char *)"Now", (PyCFunction)_wrap_Now, METH_NOARGS, NULL},
{ (char *)"Shell", (PyCFunction) _wrap_Shell, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"StartTimer", (PyCFunction)_wrap_StartTimer, METH_NOARGS, NULL},
{ (char *)"GetOsVersion", (PyCFunction)_wrap_GetOsVersion, METH_NOARGS, NULL},
{ (char *)"GetOsDescription", (PyCFunction)_wrap_GetOsDescription, METH_NOARGS, NULL},
{ (char *)"IsPlatformLittleEndian", (PyCFunction)_wrap_IsPlatformLittleEndian, METH_NOARGS, NULL},
@@ -39720,6 +39642,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Config_swiginit", Config_swiginit, METH_VARARGS, NULL},
{ (char *)"new_FileConfig", (PyCFunction) _wrap_new_FileConfig, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_FileConfig", (PyCFunction)_wrap_delete_FileConfig, METH_O, NULL},
{ (char *)"FileConfig_GetGlobalFileName", (PyCFunction) _wrap_FileConfig_GetGlobalFileName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileConfig_GetLocalFileName", (PyCFunction) _wrap_FileConfig_GetLocalFileName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileConfig_swigregister", FileConfig_swigregister, METH_VARARGS, NULL},
{ (char *)"FileConfig_swiginit", FileConfig_swiginit, METH_VARARGS, NULL},
{ (char *)"new_ConfigPathChanger", (PyCFunction) _wrap_new_ConfigPathChanger, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -39777,8 +39701,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DateTime_SetToWeekDay", (PyCFunction) _wrap_DateTime_SetToWeekDay, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_SetToLastWeekDay", (PyCFunction) _wrap_DateTime_SetToLastWeekDay, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_GetLastWeekDay", (PyCFunction) _wrap_DateTime_GetLastWeekDay, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_SetToTheWeek", (PyCFunction) _wrap_DateTime_SetToTheWeek, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_GetWeek", (PyCFunction) _wrap_DateTime_GetWeek, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_SetToWeekOfYear", (PyCFunction) _wrap_DateTime_SetToWeekOfYear, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_SetToLastMonthDay", (PyCFunction) _wrap_DateTime_SetToLastMonthDay, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"DateTime_GetLastMonthDay", (PyCFunction) _wrap_DateTime_GetLastMonthDay, METH_VARARGS | METH_KEYWORDS, NULL},
wxPython/src/gtk/_windows.py
+24 -22
View File
@@ -305,13 +305,11 @@ ICONIZE = _windows_.ICONIZE
MINIMIZE = _windows_.MINIMIZE
MAXIMIZE = _windows_.MAXIMIZE
CLOSE_BOX = _windows_.CLOSE_BOX
THICK_FRAME = _windows_.THICK_FRAME
SYSTEM_MENU = _windows_.SYSTEM_MENU
MINIMIZE_BOX = _windows_.MINIMIZE_BOX
MAXIMIZE_BOX = _windows_.MAXIMIZE_BOX
TINY_CAPTION_HORIZ = _windows_.TINY_CAPTION_HORIZ
TINY_CAPTION_VERT = _windows_.TINY_CAPTION_VERT
RESIZE_BOX = _windows_.RESIZE_BOX
RESIZE_BORDER = _windows_.RESIZE_BORDER
DIALOG_NO_PARENT = _windows_.DIALOG_NO_PARENT
DEFAULT_FRAME_STYLE = _windows_.DEFAULT_FRAME_STYLE
@@ -325,12 +323,18 @@ FRAME_DRAWER = _windows_.FRAME_DRAWER
FRAME_EX_METAL = _windows_.FRAME_EX_METAL
DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL
WS_EX_CONTEXTHELP = _windows_.WS_EX_CONTEXTHELP
DIALOG_MODAL = _windows_.DIALOG_MODAL
DIALOG_MODELESS = _windows_.DIALOG_MODELESS
USER_COLOURS = _windows_.USER_COLOURS
NO_3D = _windows_.NO_3D
FRAME_EX_CONTEXTHELP = _windows_.FRAME_EX_CONTEXTHELP
DIALOG_EX_CONTEXTHELP = _windows_.DIALOG_EX_CONTEXTHELP
# deprecated
RESIZE_BOX = MAXIMIZE_BOX
THICK_FRAME = RESIZE_BORDER
# Obsolete
wxDIALOG_MODAL = 0
wxDIALOG_MODELESS = 0
wxUSER_COLOURS = 0
wxNO_3D = 0
FULLSCREEN_NOMENUBAR = _windows_.FULLSCREEN_NOMENUBAR
FULLSCREEN_NOTOOLBAR = _windows_.FULLSCREEN_NOTOOLBAR
FULLSCREEN_NOSTATUSBAR = _windows_.FULLSCREEN_NOSTATUSBAR
@@ -1418,14 +1422,6 @@ class SashWindow(_core.Window):
"""GetSashVisible(self, int edge) -> bool"""
return _windows_.SashWindow_GetSashVisible(*args, **kwargs)
def SetSashBorder(*args, **kwargs):
"""SetSashBorder(self, int edge, bool border)"""
return _windows_.SashWindow_SetSashBorder(*args, **kwargs)
def HasBorder(*args, **kwargs):
"""HasBorder(self, int edge) -> bool"""
return _windows_.SashWindow_HasBorder(*args, **kwargs)
def GetEdgeMargin(*args, **kwargs):
"""GetEdgeMargin(self, int edge) -> int"""
return _windows_.SashWindow_GetEdgeMargin(*args, **kwargs)
@@ -2011,6 +2007,10 @@ class VListBox(VScrolledWindow):
"""SetSelectionBackground(self, Colour col)"""
return _windows_.VListBox_SetSelectionBackground(*args, **kwargs)
def RefreshSelected(*args, **kwargs):
"""RefreshSelected(self)"""
return _windows_.VListBox_RefreshSelected(*args, **kwargs)
def OnDrawSeparator(*args, **kwargs):
"""OnDrawSeparator(self, DC dc, Rect rect, size_t n)"""
return _windows_.VListBox_OnDrawSeparator(*args, **kwargs)
@@ -2305,9 +2305,10 @@ def GetColourFromUser(*args, **kwargs):
String caption=EmptyString) -> Colour
"""
return _windows_.GetColourFromUser(*args, **kwargs)
DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST
DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
class DirDialog(Dialog):
"""
wx.DirDialog allows the user to select a directory by browising the
@@ -2363,13 +2364,6 @@ class DirDialog(Dialog):
Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`")
_windows_.DirDialog_swigregister(DirDialog)
OPEN = _windows_.OPEN
SAVE = _windows_.SAVE
OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST
MULTIPLE = _windows_.MULTIPLE
CHANGE_DIR = _windows_.CHANGE_DIR
HIDE_READONLY = _windows_.HIDE_READONLY
FD_OPEN = _windows_.FD_OPEN
FD_SAVE = _windows_.FD_SAVE
FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT
@@ -2378,6 +2372,14 @@ FD_MULTIPLE = _windows_.FD_MULTIPLE
FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
FD_PREVIEW = _windows_.FD_PREVIEW
FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
# deprecated names
OPEN = FD_OPEN,
SAVE = FD_SAVE,
OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT,
FILE_MUST_EXIST = FD_FILE_MUST_EXIST,
MULTIPLE = FD_MULTIPLE,
CHANGE_DIR = FD_CHANGE_DIR
class FileDialog(Dialog):
"""
wx.FileDialog allows the user to select one or more files from the
wxPython/src/gtk/_windows_wrap.cpp
+30 -104
View File
@@ -11104,94 +11104,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_SashWindow_SetSashBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxSashWindow *arg1 = (wxSashWindow *) 0 ;
wxSashEdgePosition arg2 ;
bool arg3 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
bool val3 ;
int ecode3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "edge",(char *) "border", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSashWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SashWindow_SetSashBorder" "', expected argument " "1"" of type '" "wxSashWindow *""'");
}
arg1 = reinterpret_cast< wxSashWindow * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SashWindow_SetSashBorder" "', expected argument " "2"" of type '" "wxSashEdgePosition""'");
}
arg2 = static_cast< wxSashEdgePosition >(val2);
ecode3 = SWIG_AsVal_bool(obj2, &val3);
if (!SWIG_IsOK(ecode3)) {
SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SashWindow_SetSashBorder" "', expected argument " "3"" of type '" "bool""'");
}
arg3 = static_cast< bool >(val3);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetSashBorder(arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_SashWindow_HasBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxSashWindow *arg1 = (wxSashWindow *) 0 ;
wxSashEdgePosition arg2 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "edge", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSashWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SashWindow_HasBorder" "', expected argument " "1"" of type '" "wxSashWindow const *""'");
}
arg1 = reinterpret_cast< wxSashWindow * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SashWindow_HasBorder" "', expected argument " "2"" of type '" "wxSashEdgePosition""'");
}
arg2 = static_cast< wxSashEdgePosition >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxSashWindow const *)arg1)->HasBorder(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxSashWindow *arg1 = (wxSashWindow *) 0 ;
@@ -15433,6 +15345,33 @@ fail:
}
SWIGINTERN PyObject *_wrap_VListBox_RefreshSelected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyVListBox *arg1 = (wxPyVListBox *) 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_wxPyVListBox, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VListBox_RefreshSelected" "', expected argument " "1"" of type '" "wxPyVListBox *""'");
}
arg1 = reinterpret_cast< wxPyVListBox * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->RefreshSelected();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_VListBox_OnDrawSeparator(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
@@ -31978,8 +31917,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SashWindow_Create", (PyCFunction) _wrap_SashWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_SetSashVisible", (PyCFunction) _wrap_SashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_GetSashVisible", (PyCFunction) _wrap_SashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_SetSashBorder", (PyCFunction) _wrap_SashWindow_SetSashBorder, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_HasBorder", (PyCFunction) _wrap_SashWindow_HasBorder, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_GetEdgeMargin", (PyCFunction) _wrap_SashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"SashWindow_GetDefaultBorderSize", (PyCFunction)_wrap_SashWindow_GetDefaultBorderSize, METH_O, NULL},
@@ -32107,6 +32044,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"VListBox_SetMargins", (PyCFunction) _wrap_VListBox_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"VListBox_SetMarginsXY", (PyCFunction) _wrap_VListBox_SetMarginsXY, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"VListBox_SetSelectionBackground", (PyCFunction) _wrap_VListBox_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"VListBox_RefreshSelected", (PyCFunction)_wrap_VListBox_RefreshSelected, METH_O, NULL},
{ (char *)"VListBox_OnDrawSeparator", (PyCFunction) _wrap_VListBox_OnDrawSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"VListBox_OnDrawBackground", (PyCFunction) _wrap_VListBox_OnDrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"VListBox_swigregister", VListBox_swigregister, METH_VARARGS, NULL},
@@ -34866,13 +34804,11 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "MINIMIZE",SWIG_From_int(static_cast< int >(wxMINIMIZE)));
SWIG_Python_SetConstant(d, "MAXIMIZE",SWIG_From_int(static_cast< int >(wxMAXIMIZE)));
SWIG_Python_SetConstant(d, "CLOSE_BOX",SWIG_From_int(static_cast< int >(wxCLOSE_BOX)));
SWIG_Python_SetConstant(d, "THICK_FRAME",SWIG_From_int(static_cast< int >(wxTHICK_FRAME)));
SWIG_Python_SetConstant(d, "SYSTEM_MENU",SWIG_From_int(static_cast< int >(wxSYSTEM_MENU)));
SWIG_Python_SetConstant(d, "MINIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMINIMIZE_BOX)));
SWIG_Python_SetConstant(d, "MAXIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMAXIMIZE_BOX)));
SWIG_Python_SetConstant(d, "TINY_CAPTION_HORIZ",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_HORIZ)));
SWIG_Python_SetConstant(d, "TINY_CAPTION_VERT",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_VERT)));
SWIG_Python_SetConstant(d, "RESIZE_BOX",SWIG_From_int(static_cast< int >(wxRESIZE_BOX)));
SWIG_Python_SetConstant(d, "RESIZE_BORDER",SWIG_From_int(static_cast< int >(wxRESIZE_BORDER)));
SWIG_Python_SetConstant(d, "DIALOG_NO_PARENT",SWIG_From_int(static_cast< int >(wxDIALOG_NO_PARENT)));
SWIG_Python_SetConstant(d, "DEFAULT_FRAME_STYLE",SWIG_From_int(static_cast< int >(wxDEFAULT_FRAME_STYLE)));
@@ -34886,10 +34822,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "FRAME_EX_METAL",SWIG_From_int(static_cast< int >(wxFRAME_EX_METAL)));
SWIG_Python_SetConstant(d, "DIALOG_EX_METAL",SWIG_From_int(static_cast< int >(wxDIALOG_EX_METAL)));
SWIG_Python_SetConstant(d, "WS_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxWS_EX_CONTEXTHELP)));
SWIG_Python_SetConstant(d, "DIALOG_MODAL",SWIG_From_int(static_cast< int >(wxDIALOG_MODAL)));
SWIG_Python_SetConstant(d, "DIALOG_MODELESS",SWIG_From_int(static_cast< int >(wxDIALOG_MODELESS)));
SWIG_Python_SetConstant(d, "USER_COLOURS",SWIG_From_int(static_cast< int >(wxUSER_COLOURS)));
SWIG_Python_SetConstant(d, "NO_3D",SWIG_From_int(static_cast< int >(wxNO_3D)));
SWIG_Python_SetConstant(d, "FRAME_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxFRAME_EX_CONTEXTHELP)));
SWIG_Python_SetConstant(d, "DIALOG_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxDIALOG_EX_CONTEXTHELP)));
SWIG_Python_SetConstant(d, "FULLSCREEN_NOMENUBAR",SWIG_From_int(static_cast< int >(wxFULLSCREEN_NOMENUBAR)));
@@ -34985,16 +34917,10 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "DD_DIR_MUST_EXIST",SWIG_From_int(static_cast< int >(wxDD_DIR_MUST_EXIST)));
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));
SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
wxPython/src/gtk/aui.py
+23 -13
View File
@@ -1495,10 +1495,6 @@ class AuiMDIParentFrame(_windows.Frame):
"""GetArtProvider(self) -> AuiTabArt"""
return _aui.AuiMDIParentFrame_GetArtProvider(*args, **kwargs)
def GetNotebook(*args, **kwargs):
"""GetNotebook(self) -> AuiNotebook"""
return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
def GetWindowMenu(*args, **kwargs):
"""GetWindowMenu(self) -> Menu"""
return _aui.AuiMDIParentFrame_GetWindowMenu(*args, **kwargs)
@@ -1515,18 +1511,10 @@ class AuiMDIParentFrame(_windows.Frame):
"""ProcessEvent(self, Event event) -> bool"""
return _aui.AuiMDIParentFrame_ProcessEvent(*args, **kwargs)
def GetActiveChild(*args, **kwargs):
"""GetActiveChild(self) -> AuiMDIChildFrame"""
return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
def SetActiveChild(*args, **kwargs):
"""SetActiveChild(self, AuiMDIChildFrame pChildFrame)"""
return _aui.AuiMDIParentFrame_SetActiveChild(*args, **kwargs)
def GetClientWindow(*args, **kwargs):
"""GetClientWindow(self) -> AuiMDIClientWindow"""
return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
def OnCreateClient(*args, **kwargs):
"""OnCreateClient(self) -> AuiMDIClientWindow"""
return _aui.AuiMDIParentFrame_OnCreateClient(*args, **kwargs)
@@ -1551,6 +1539,18 @@ class AuiMDIParentFrame(_windows.Frame):
"""ActivatePrevious(self)"""
return _aui.AuiMDIParentFrame_ActivatePrevious(*args, **kwargs)
def GetNotebook(*args, **kwargs):
"""GetNotebook(self) -> AuiNotebook"""
return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
def GetActiveChild(*args, **kwargs):
"""GetActiveChild(self) -> AuiMDIChildFrame"""
return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
def GetClientWindow(*args, **kwargs):
"""GetClientWindow(self) -> AuiMDIClientWindow"""
return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
_aui.AuiMDIParentFrame_swigregister(AuiMDIParentFrame)
def PreAuiMDIParentFrame(*args, **kwargs):
@@ -1719,8 +1719,18 @@ class PyAuiDockArt(AuiDefaultDockArt):
methods to the Python methods implemented in the derived 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) -> PyAuiDockArt
This version of the `AuiDockArt` class has been instrumented to be
subclassable in Python and to reflect all calls to the C++ base class
methods to the Python methods implemented in the derived class.
"""
_aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs))
PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt)
_aui.PyAuiDockArt_swigregister(PyAuiDockArt)
class PyAuiTabArt(AuiDefaultTabArt):
wxPython/src/gtk/aui_wrap.cpp
+126 -87
View File
@@ -2926,6 +2926,15 @@ SWIG_From_size_t (size_t value)
return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
}
SWIGINTERN wxAuiNotebook *wxAuiMDIParentFrame__GetNotebook(wxAuiMDIParentFrame const *self){
return self->GetNotebook();
}
SWIGINTERN wxAuiMDIChildFrame *wxAuiMDIParentFrame__GetActiveChild(wxAuiMDIParentFrame const *self){
return self->GetActiveChild();
}
SWIGINTERN wxAuiMDIClientWindow *wxAuiMDIParentFrame__GetClientWindow(wxAuiMDIParentFrame const *self){
return self->GetClientWindow();
}
// A wxDocArt class that knows how to forward virtuals to Python methods
class wxPyAuiDockArt : public wxAuiDefaultDockArt
@@ -16363,34 +16372,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiNotebook *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiNotebook *)((wxAuiMDIParentFrame const *)arg1)->GetNotebook();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16541,34 +16522,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiMDIChildFrame *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiMDIChildFrame *)((wxAuiMDIParentFrame const *)arg1)->GetActiveChild();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIChildFrame, 0 | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_SetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16607,34 +16560,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiMDIClientWindow *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiMDIClientWindow *)((wxAuiMDIParentFrame const *)arg1)->GetClientWindow();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIClientWindow, 0 | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_OnCreateClient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16811,6 +16736,96 @@ fail:
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiNotebook *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiNotebook *)wxAuiMDIParentFrame__GetNotebook((wxAuiMDIParentFrame const *)arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiMDIChildFrame *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiMDIChildFrame *)wxAuiMDIParentFrame__GetActiveChild((wxAuiMDIParentFrame const *)arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
wxAuiMDIClientWindow *result = 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_wxAuiMDIParentFrame, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'");
}
arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAuiMDIClientWindow *)wxAuiMDIParentFrame__GetClientWindow((wxAuiMDIParentFrame const *)arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *AuiMDIParentFrame_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18146,6 +18161,24 @@ SWIGINTERN PyObject *AuiMDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_PyAuiDockArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyAuiDockArt *result = 0 ;
if (!SWIG_Python_UnpackTuple(args,"new_PyAuiDockArt",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPyAuiDockArt *)new wxPyAuiDockArt();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiDockArt, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18153,6 +18186,10 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Py_Void();
}
SWIGINTERN PyObject *PyAuiDockArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyAuiTabArt *result = 0 ;
@@ -18563,20 +18600,20 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"AuiMDIParentFrame_Create", (PyCFunction) _wrap_AuiMDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_SetArtProvider", (PyCFunction) _wrap_AuiMDIParentFrame_SetArtProvider, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_GetArtProvider", (PyCFunction)_wrap_AuiMDIParentFrame_GetArtProvider, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_AuiMDIParentFrame_GetWindowMenu, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_AuiMDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_SetChildMenuBar", (PyCFunction) _wrap_AuiMDIParentFrame_SetChildMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_ProcessEvent", (PyCFunction) _wrap_AuiMDIParentFrame_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_SetActiveChild", (PyCFunction) _wrap_AuiMDIParentFrame_SetActiveChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_OnCreateClient", (PyCFunction)_wrap_AuiMDIParentFrame_OnCreateClient, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_Cascade", (PyCFunction)_wrap_AuiMDIParentFrame_Cascade, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_Tile", (PyCFunction) _wrap_AuiMDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIParentFrame_ArrangeIcons", (PyCFunction)_wrap_AuiMDIParentFrame_ArrangeIcons, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_ActivateNext", (PyCFunction)_wrap_AuiMDIParentFrame_ActivateNext, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_ActivatePrevious", (PyCFunction)_wrap_AuiMDIParentFrame_ActivatePrevious, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
{ (char *)"AuiMDIParentFrame_swigregister", AuiMDIParentFrame_swigregister, METH_VARARGS, NULL},
{ (char *)"AuiMDIParentFrame_swiginit", AuiMDIParentFrame_swiginit, METH_VARARGS, NULL},
{ (char *)"new_PreAuiMDIChildFrame", (PyCFunction)_wrap_new_PreAuiMDIChildFrame, METH_NOARGS, NULL},
@@ -18614,7 +18651,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"AuiMDIClientWindow_SetSelection", (PyCFunction) _wrap_AuiMDIClientWindow_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL},
{ (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL},
{ (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL},
{ (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL},
{ (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL},
{ (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL},
{ (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL},
{ (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL},
wxPython/src/gtk/combo.py
+3
View File
@@ -65,6 +65,9 @@ __docfilter__ = wx.__DocFilter(globals())
CC_BUTTON_OUTSIDE_BORDER = _combo.CC_BUTTON_OUTSIDE_BORDER
CC_POPUP_ON_MOUSE_UP = _combo.CC_POPUP_ON_MOUSE_UP
CC_NO_TEXT_AUTO_SELECT = _combo.CC_NO_TEXT_AUTO_SELECT
CC_BUTTON_STAYS_DOWN = _combo.CC_BUTTON_STAYS_DOWN
CC_FULL_BUTTON = _combo.CC_FULL_BUTTON
CC_BUTTON_COVERS_BORDER = _combo.CC_BUTTON_COVERS_BORDER
CC_MF_ON_BUTTON = _combo.CC_MF_ON_BUTTON
CC_MF_ON_CLICK_AREA = _combo.CC_MF_ON_CLICK_AREA
class ComboCtrlFeatures(object):
wxPython/src/gtk/combo_wrap.cpp
+3
View File
@@ -9335,6 +9335,9 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "CC_BUTTON_OUTSIDE_BORDER",SWIG_From_int(static_cast< int >(wxCC_BUTTON_OUTSIDE_BORDER)));
SWIG_Python_SetConstant(d, "CC_POPUP_ON_MOUSE_UP",SWIG_From_int(static_cast< int >(wxCC_POPUP_ON_MOUSE_UP)));
SWIG_Python_SetConstant(d, "CC_NO_TEXT_AUTO_SELECT",SWIG_From_int(static_cast< int >(wxCC_NO_TEXT_AUTO_SELECT)));
SWIG_Python_SetConstant(d, "CC_BUTTON_STAYS_DOWN",SWIG_From_int(static_cast< int >(wxCC_BUTTON_STAYS_DOWN)));
SWIG_Python_SetConstant(d, "CC_FULL_BUTTON",SWIG_From_int(static_cast< int >(wxCC_FULL_BUTTON)));
SWIG_Python_SetConstant(d, "CC_BUTTON_COVERS_BORDER",SWIG_From_int(static_cast< int >(wxCC_BUTTON_COVERS_BORDER)));
SWIG_Python_SetConstant(d, "CC_MF_ON_BUTTON",SWIG_From_int(static_cast< int >(wxCC_MF_ON_BUTTON)));
SWIG_Python_SetConstant(d, "CC_MF_ON_CLICK_AREA",SWIG_From_int(static_cast< int >(wxCC_MF_ON_CLICK_AREA)));
SWIG_Python_SetConstant(d, "ComboCtrlFeatures_MovableButton",SWIG_From_int(static_cast< int >(wxComboCtrlFeatures::MovableButton)));
wxPython/src/gtk/grid.py
+18
View File
@@ -68,6 +68,9 @@ GRID_VALUE_TEXT = _grid.GRID_VALUE_TEXT
GRID_VALUE_LONG = _grid.GRID_VALUE_LONG
GRID_VALUE_CHOICEINT = _grid.GRID_VALUE_CHOICEINT
GRID_VALUE_DATETIME = _grid.GRID_VALUE_DATETIME
GRID_AUTOSIZE = _grid.GRID_AUTOSIZE
GRID_COLUMN = _grid.GRID_COLUMN
GRID_ROW = _grid.GRID_ROW
GRID_DEFAULT_NUMBER_ROWS = _grid.GRID_DEFAULT_NUMBER_ROWS
GRID_DEFAULT_NUMBER_COLS = _grid.GRID_DEFAULT_NUMBER_COLS
GRID_DEFAULT_ROW_HEIGHT = _grid.GRID_DEFAULT_ROW_HEIGHT
@@ -2094,6 +2097,21 @@ def Grid_GetClassDefaultAttributes(*args, **kwargs):
"""
return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs)
class GridUpdateLocker(object):
"""Proxy of C++ GridUpdateLocker 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, Grid grid=None) -> GridUpdateLocker"""
_grid.GridUpdateLocker_swiginit(self,_grid.new_GridUpdateLocker(*args, **kwargs))
__swig_destroy__ = _grid.delete_GridUpdateLocker
__del__ = lambda self : None;
def Create(*args, **kwargs):
"""Create(self, Grid grid)"""
return _grid.GridUpdateLocker_Create(*args, **kwargs)
_grid.GridUpdateLocker_swigregister(GridUpdateLocker)
class GridEvent(_core.NotifyEvent):
"""Proxy of C++ GridEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
wxPython/src/gtk/grid_wrap.cpp
+248 -126
View File
@@ -2543,122 +2543,123 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
#define SWIGTYPE_p_wxGridStringTable swig_types[77]
#define SWIGTYPE_p_wxGridTableBase swig_types[78]
#define SWIGTYPE_p_wxGridTableMessage swig_types[79]
#define SWIGTYPE_p_wxICOHandler swig_types[80]
#define SWIGTYPE_p_wxIconizeEvent swig_types[81]
#define SWIGTYPE_p_wxIdleEvent swig_types[82]
#define SWIGTYPE_p_wxImage swig_types[83]
#define SWIGTYPE_p_wxImageHandler swig_types[84]
#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[85]
#define SWIGTYPE_p_wxInitDialogEvent swig_types[86]
#define SWIGTYPE_p_wxJPEGHandler swig_types[87]
#define SWIGTYPE_p_wxKeyEvent swig_types[88]
#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[89]
#define SWIGTYPE_p_wxLayoutConstraints swig_types[90]
#define SWIGTYPE_p_wxMDIChildFrame swig_types[91]
#define SWIGTYPE_p_wxMDIClientWindow swig_types[92]
#define SWIGTYPE_p_wxMDIParentFrame swig_types[93]
#define SWIGTYPE_p_wxMaximizeEvent swig_types[94]
#define SWIGTYPE_p_wxMenu swig_types[95]
#define SWIGTYPE_p_wxMenuBar swig_types[96]
#define SWIGTYPE_p_wxMenuEvent swig_types[97]
#define SWIGTYPE_p_wxMenuItem swig_types[98]
#define SWIGTYPE_p_wxMessageDialog swig_types[99]
#define SWIGTYPE_p_wxMiniFrame swig_types[100]
#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[101]
#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[102]
#define SWIGTYPE_p_wxMouseEvent swig_types[103]
#define SWIGTYPE_p_wxMoveEvent swig_types[104]
#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[105]
#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[106]
#define SWIGTYPE_p_wxNcPaintEvent swig_types[107]
#define SWIGTYPE_p_wxNotifyEvent swig_types[108]
#define SWIGTYPE_p_wxNumberEntryDialog swig_types[109]
#define SWIGTYPE_p_wxObject swig_types[110]
#define SWIGTYPE_p_wxPCXHandler swig_types[111]
#define SWIGTYPE_p_wxPNGHandler swig_types[112]
#define SWIGTYPE_p_wxPNMHandler swig_types[113]
#define SWIGTYPE_p_wxPageSetupDialog swig_types[114]
#define SWIGTYPE_p_wxPageSetupDialogData swig_types[115]
#define SWIGTYPE_p_wxPaintEvent swig_types[116]
#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[117]
#define SWIGTYPE_p_wxPanel swig_types[118]
#define SWIGTYPE_p_wxPaperSize swig_types[119]
#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[120]
#define SWIGTYPE_p_wxPen swig_types[121]
#define SWIGTYPE_p_wxPoint swig_types[122]
#define SWIGTYPE_p_wxPopupWindow swig_types[123]
#define SWIGTYPE_p_wxPreviewCanvas swig_types[124]
#define SWIGTYPE_p_wxPreviewControlBar swig_types[125]
#define SWIGTYPE_p_wxPreviewFrame swig_types[126]
#define SWIGTYPE_p_wxPrintData swig_types[127]
#define SWIGTYPE_p_wxPrintDialog swig_types[128]
#define SWIGTYPE_p_wxPrintDialogData swig_types[129]
#define SWIGTYPE_p_wxPrintPreview swig_types[130]
#define SWIGTYPE_p_wxPrinter swig_types[131]
#define SWIGTYPE_p_wxProgressDialog swig_types[132]
#define SWIGTYPE_p_wxPyApp swig_types[133]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[134]
#define SWIGTYPE_p_wxPyEvent swig_types[135]
#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[136]
#define SWIGTYPE_p_wxPyGridCellEditor swig_types[137]
#define SWIGTYPE_p_wxPyGridCellRenderer swig_types[138]
#define SWIGTYPE_p_wxPyGridTableBase swig_types[139]
#define SWIGTYPE_p_wxPyHtmlListBox swig_types[140]
#define SWIGTYPE_p_wxPyImageHandler swig_types[141]
#define SWIGTYPE_p_wxPyPanel swig_types[142]
#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[143]
#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[144]
#define SWIGTYPE_p_wxPyPreviewFrame swig_types[145]
#define SWIGTYPE_p_wxPyPrintPreview swig_types[146]
#define SWIGTYPE_p_wxPyPrintout swig_types[147]
#define SWIGTYPE_p_wxPyScrolledWindow swig_types[148]
#define SWIGTYPE_p_wxPySizer swig_types[149]
#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[150]
#define SWIGTYPE_p_wxPyVListBox swig_types[151]
#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[152]
#define SWIGTYPE_p_wxPyValidator swig_types[153]
#define SWIGTYPE_p_wxPyWindow swig_types[154]
#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[155]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[156]
#define SWIGTYPE_p_wxRect swig_types[157]
#define SWIGTYPE_p_wxSashEvent swig_types[158]
#define SWIGTYPE_p_wxSashLayoutWindow swig_types[159]
#define SWIGTYPE_p_wxSashWindow swig_types[160]
#define SWIGTYPE_p_wxScrollEvent swig_types[161]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[162]
#define SWIGTYPE_p_wxScrolledWindow swig_types[163]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[164]
#define SWIGTYPE_p_wxShowEvent swig_types[165]
#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[166]
#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[167]
#define SWIGTYPE_p_wxSize swig_types[168]
#define SWIGTYPE_p_wxSizeEvent swig_types[169]
#define SWIGTYPE_p_wxSizer swig_types[170]
#define SWIGTYPE_p_wxSizerItem swig_types[171]
#define SWIGTYPE_p_wxSplashScreen swig_types[172]
#define SWIGTYPE_p_wxSplashScreenWindow swig_types[173]
#define SWIGTYPE_p_wxSplitterEvent swig_types[174]
#define SWIGTYPE_p_wxSplitterWindow swig_types[175]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[176]
#define SWIGTYPE_p_wxStatusBar swig_types[177]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[178]
#define SWIGTYPE_p_wxString swig_types[179]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[180]
#define SWIGTYPE_p_wxTGAHandler swig_types[181]
#define SWIGTYPE_p_wxTIFFHandler swig_types[182]
#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[183]
#define SWIGTYPE_p_wxTextEntryDialog swig_types[184]
#define SWIGTYPE_p_wxTipWindow swig_types[185]
#define SWIGTYPE_p_wxTopLevelWindow swig_types[186]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[187]
#define SWIGTYPE_p_wxValidator swig_types[188]
#define SWIGTYPE_p_wxVisualAttributes swig_types[189]
#define SWIGTYPE_p_wxWindow swig_types[190]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[191]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[192]
#define SWIGTYPE_p_wxXPMHandler swig_types[193]
static swig_type_info *swig_types[195];
static swig_module_info swig_module = {swig_types, 194, 0, 0, 0, 0};
#define SWIGTYPE_p_wxGridUpdateLocker swig_types[80]
#define SWIGTYPE_p_wxICOHandler swig_types[81]
#define SWIGTYPE_p_wxIconizeEvent swig_types[82]
#define SWIGTYPE_p_wxIdleEvent swig_types[83]
#define SWIGTYPE_p_wxImage swig_types[84]
#define SWIGTYPE_p_wxImageHandler swig_types[85]
#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[86]
#define SWIGTYPE_p_wxInitDialogEvent swig_types[87]
#define SWIGTYPE_p_wxJPEGHandler swig_types[88]
#define SWIGTYPE_p_wxKeyEvent swig_types[89]
#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[90]
#define SWIGTYPE_p_wxLayoutConstraints swig_types[91]
#define SWIGTYPE_p_wxMDIChildFrame swig_types[92]
#define SWIGTYPE_p_wxMDIClientWindow swig_types[93]
#define SWIGTYPE_p_wxMDIParentFrame swig_types[94]
#define SWIGTYPE_p_wxMaximizeEvent swig_types[95]
#define SWIGTYPE_p_wxMenu swig_types[96]
#define SWIGTYPE_p_wxMenuBar swig_types[97]
#define SWIGTYPE_p_wxMenuEvent swig_types[98]
#define SWIGTYPE_p_wxMenuItem swig_types[99]
#define SWIGTYPE_p_wxMessageDialog swig_types[100]
#define SWIGTYPE_p_wxMiniFrame swig_types[101]
#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[102]
#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[103]
#define SWIGTYPE_p_wxMouseEvent swig_types[104]
#define SWIGTYPE_p_wxMoveEvent swig_types[105]
#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[106]
#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[107]
#define SWIGTYPE_p_wxNcPaintEvent swig_types[108]
#define SWIGTYPE_p_wxNotifyEvent swig_types[109]
#define SWIGTYPE_p_wxNumberEntryDialog swig_types[110]
#define SWIGTYPE_p_wxObject swig_types[111]
#define SWIGTYPE_p_wxPCXHandler swig_types[112]
#define SWIGTYPE_p_wxPNGHandler swig_types[113]
#define SWIGTYPE_p_wxPNMHandler swig_types[114]
#define SWIGTYPE_p_wxPageSetupDialog swig_types[115]
#define SWIGTYPE_p_wxPageSetupDialogData swig_types[116]
#define SWIGTYPE_p_wxPaintEvent swig_types[117]
#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[118]
#define SWIGTYPE_p_wxPanel swig_types[119]
#define SWIGTYPE_p_wxPaperSize swig_types[120]
#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[121]
#define SWIGTYPE_p_wxPen swig_types[122]
#define SWIGTYPE_p_wxPoint swig_types[123]
#define SWIGTYPE_p_wxPopupWindow swig_types[124]
#define SWIGTYPE_p_wxPreviewCanvas swig_types[125]
#define SWIGTYPE_p_wxPreviewControlBar swig_types[126]
#define SWIGTYPE_p_wxPreviewFrame swig_types[127]
#define SWIGTYPE_p_wxPrintData swig_types[128]
#define SWIGTYPE_p_wxPrintDialog swig_types[129]
#define SWIGTYPE_p_wxPrintDialogData swig_types[130]
#define SWIGTYPE_p_wxPrintPreview swig_types[131]
#define SWIGTYPE_p_wxPrinter swig_types[132]
#define SWIGTYPE_p_wxProgressDialog swig_types[133]
#define SWIGTYPE_p_wxPyApp swig_types[134]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[135]
#define SWIGTYPE_p_wxPyEvent swig_types[136]
#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[137]
#define SWIGTYPE_p_wxPyGridCellEditor swig_types[138]
#define SWIGTYPE_p_wxPyGridCellRenderer swig_types[139]
#define SWIGTYPE_p_wxPyGridTableBase swig_types[140]
#define SWIGTYPE_p_wxPyHtmlListBox swig_types[141]
#define SWIGTYPE_p_wxPyImageHandler swig_types[142]
#define SWIGTYPE_p_wxPyPanel swig_types[143]
#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[144]
#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[145]
#define SWIGTYPE_p_wxPyPreviewFrame swig_types[146]
#define SWIGTYPE_p_wxPyPrintPreview swig_types[147]
#define SWIGTYPE_p_wxPyPrintout swig_types[148]
#define SWIGTYPE_p_wxPyScrolledWindow swig_types[149]
#define SWIGTYPE_p_wxPySizer swig_types[150]
#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[151]
#define SWIGTYPE_p_wxPyVListBox swig_types[152]
#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[153]
#define SWIGTYPE_p_wxPyValidator swig_types[154]
#define SWIGTYPE_p_wxPyWindow swig_types[155]
#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[156]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[157]
#define SWIGTYPE_p_wxRect swig_types[158]
#define SWIGTYPE_p_wxSashEvent swig_types[159]
#define SWIGTYPE_p_wxSashLayoutWindow swig_types[160]
#define SWIGTYPE_p_wxSashWindow swig_types[161]
#define SWIGTYPE_p_wxScrollEvent swig_types[162]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[163]
#define SWIGTYPE_p_wxScrolledWindow swig_types[164]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[165]
#define SWIGTYPE_p_wxShowEvent swig_types[166]
#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[167]
#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[168]
#define SWIGTYPE_p_wxSize swig_types[169]
#define SWIGTYPE_p_wxSizeEvent swig_types[170]
#define SWIGTYPE_p_wxSizer swig_types[171]
#define SWIGTYPE_p_wxSizerItem swig_types[172]
#define SWIGTYPE_p_wxSplashScreen swig_types[173]
#define SWIGTYPE_p_wxSplashScreenWindow swig_types[174]
#define SWIGTYPE_p_wxSplitterEvent swig_types[175]
#define SWIGTYPE_p_wxSplitterWindow swig_types[176]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[177]
#define SWIGTYPE_p_wxStatusBar swig_types[178]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[179]
#define SWIGTYPE_p_wxString swig_types[180]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[181]
#define SWIGTYPE_p_wxTGAHandler swig_types[182]
#define SWIGTYPE_p_wxTIFFHandler swig_types[183]
#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[184]
#define SWIGTYPE_p_wxTextEntryDialog swig_types[185]
#define SWIGTYPE_p_wxTipWindow swig_types[186]
#define SWIGTYPE_p_wxTopLevelWindow swig_types[187]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[188]
#define SWIGTYPE_p_wxValidator swig_types[189]
#define SWIGTYPE_p_wxVisualAttributes swig_types[190]
#define SWIGTYPE_p_wxWindow swig_types[191]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[192]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[193]
#define SWIGTYPE_p_wxXPMHandler swig_types[194]
static swig_type_info *swig_types[196];
static swig_module_info swig_module = {swig_types, 195, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -3186,6 +3187,16 @@ SWIG_FromCharPtr(const char *cptr)
}
#define SWIG_From_long PyInt_FromLong
SWIGINTERNINLINE PyObject *
SWIG_From_int (int value)
{
return SWIG_From_long (value);
}
#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS
#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS
#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT
@@ -3197,16 +3208,6 @@ SWIG_FromCharPtr(const char *cptr)
#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH
#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH
#define SWIG_From_long PyInt_FromLong
SWIGINTERNINLINE PyObject *
SWIG_From_int (int value)
{
return SWIG_From_long (value);
}
SWIGINTERN void wxGridCellWorker__setOORInfo(wxGridCellWorker *self,PyObject *_self){
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
@@ -19096,6 +19097,115 @@ SWIGINTERN PyObject *Grid_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_GridUpdateLocker(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxGrid *arg1 = (wxGrid *) NULL ;
wxGridUpdateLocker *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "grid", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_GridUpdateLocker",kwnames,&obj0)) SWIG_fail;
if (obj0) {
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGrid, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GridUpdateLocker" "', expected argument " "1"" of type '" "wxGrid *""'");
}
arg1 = reinterpret_cast< wxGrid * >(argp1);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxGridUpdateLocker *)new wxGridUpdateLocker(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGridUpdateLocker, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_delete_GridUpdateLocker(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxGridUpdateLocker *arg1 = (wxGridUpdateLocker *) 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_wxGridUpdateLocker, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GridUpdateLocker" "', expected argument " "1"" of type '" "wxGridUpdateLocker *""'");
}
arg1 = reinterpret_cast< wxGridUpdateLocker * >(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_GridUpdateLocker_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxGridUpdateLocker *arg1 = (wxGridUpdateLocker *) 0 ;
wxGrid *arg2 = (wxGrid *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "grid", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridUpdateLocker_Create",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridUpdateLocker, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridUpdateLocker_Create" "', expected argument " "1"" of type '" "wxGridUpdateLocker *""'");
}
arg1 = reinterpret_cast< wxGridUpdateLocker * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGrid, 0 | 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GridUpdateLocker_Create" "', expected argument " "2"" of type '" "wxGrid *""'");
}
arg2 = reinterpret_cast< wxGrid * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Create(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *GridUpdateLocker_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_wxGridUpdateLocker, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
SWIGINTERN PyObject *GridUpdateLocker_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_new_GridEvent(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
int arg1 ;
@@ -21048,6 +21158,11 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Grid_GetClassDefaultAttributes", (PyCFunction) _wrap_Grid_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Grid_swigregister", Grid_swigregister, METH_VARARGS, NULL},
{ (char *)"Grid_swiginit", Grid_swiginit, METH_VARARGS, NULL},
{ (char *)"new_GridUpdateLocker", (PyCFunction) _wrap_new_GridUpdateLocker, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_GridUpdateLocker", (PyCFunction)_wrap_delete_GridUpdateLocker, METH_O, NULL},
{ (char *)"GridUpdateLocker_Create", (PyCFunction) _wrap_GridUpdateLocker_Create, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"GridUpdateLocker_swigregister", GridUpdateLocker_swigregister, METH_VARARGS, NULL},
{ (char *)"GridUpdateLocker_swiginit", GridUpdateLocker_swiginit, METH_VARARGS, NULL},
{ (char *)"new_GridEvent", (PyCFunction) _wrap_new_GridEvent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"GridEvent_GetRow", (PyCFunction)_wrap_GridEvent_GetRow, METH_O, NULL},
{ (char *)"GridEvent_GetCol", (PyCFunction)_wrap_GridEvent_GetCol, METH_O, NULL},
@@ -22370,6 +22485,7 @@ static swig_type_info _swigt__p_wxGridSizeEvent = {"_p_wxGridSizeEvent", "wxGrid
static swig_type_info _swigt__p_wxGridStringTable = {"_p_wxGridStringTable", "wxGridStringTable *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxGridTableBase = {"_p_wxGridTableBase", "wxGridTableBase *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxGridTableMessage = {"_p_wxGridTableMessage", "wxGridTableMessage *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxGridUpdateLocker = {"_p_wxGridUpdateLocker", "wxGridUpdateLocker *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", "wxKeyEvent *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxObject = {"_p_wxObject", "wxObject *", 0, 0, (void*)0, 0};
@@ -22513,6 +22629,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxGridStringTable,
&_swigt__p_wxGridTableBase,
&_swigt__p_wxGridTableMessage,
&_swigt__p_wxGridUpdateLocker,
&_swigt__p_wxICOHandler,
&_swigt__p_wxIconizeEvent,
&_swigt__p_wxIdleEvent,
@@ -22762,6 +22879,7 @@ static swig_cast_info _swigc__p_wxGridSizeEvent[] = { {&_swigt__p_wxGridSizeEve
static swig_cast_info _swigc__p_wxGridStringTable[] = { {&_swigt__p_wxGridStringTable, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxGridTableBase[] = { {&_swigt__p_wxGridStringTable, _p_wxGridStringTableTo_p_wxGridTableBase, 0, 0}, {&_swigt__p_wxGridTableBase, 0, 0, 0}, {&_swigt__p_wxPyGridTableBase, _p_wxPyGridTableBaseTo_p_wxGridTableBase, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxGridTableMessage[] = { {&_swigt__p_wxGridTableMessage, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxGridUpdateLocker[] = { {&_swigt__p_wxGridUpdateLocker, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxKeyEvent[] = { {&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxGridSizeEvent, _p_wxGridSizeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxGridRangeSelectEvent, _p_wxGridRangeSelectEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxGridEvent, _p_wxGridEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}};
@@ -22905,6 +23023,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxGridStringTable,
_swigc__p_wxGridTableBase,
_swigc__p_wxGridTableMessage,
_swigc__p_wxGridUpdateLocker,
_swigc__p_wxICOHandler,
_swigc__p_wxIconizeEvent,
_swigc__p_wxIdleEvent,
@@ -23531,6 +23650,9 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "GRID_VALUE_LONG",SWIG_FromCharPtr("long"));
SWIG_Python_SetConstant(d, "GRID_VALUE_CHOICEINT",SWIG_FromCharPtr("choiceint"));
SWIG_Python_SetConstant(d, "GRID_VALUE_DATETIME",SWIG_FromCharPtr("datetime"));
SWIG_Python_SetConstant(d, "GRID_AUTOSIZE",SWIG_From_int(static_cast< int >(wxGRID_AUTOSIZE)));
SWIG_Python_SetConstant(d, "GRID_COLUMN",SWIG_From_int(static_cast< int >(wxGRID_COLUMN)));
SWIG_Python_SetConstant(d, "GRID_ROW",SWIG_From_int(static_cast< int >(wxGRID_ROW)));
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
SWIG_addvarlink(SWIG_globals(),(char*)"GridNoCellCoords",GridNoCellCoords_get, GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals(),(char*)"GridNoCellRect",GridNoCellRect_get, GridNoCellRect_set);
wxPython/src/gtk/html.py
-11
View File
@@ -255,11 +255,6 @@ class HtmlWinParser(HtmlParser):
"""GetCharWidth(self) -> int"""
return _html.HtmlWinParser_GetCharWidth(*args, **kwargs)
def GetWindow(*args, **kwargs):
"""GetWindow(self) -> HtmlWindow"""
return _html.HtmlWinParser_GetWindow(*args, **kwargs)
GetWindow = wx._deprecated(GetWindow)
def GetWindowInterface(*args, **kwargs):
"""GetWindowInterface(self) -> HtmlWindowInterface"""
return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
@@ -676,11 +671,6 @@ class HtmlCell(_core.Object):
"""GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
def GetCursor(*args, **kwargs):
"""GetCursor(self) -> Cursor"""
return _html.HtmlCell_GetCursor(*args, **kwargs)
GetCursor = wx._deprecated(GetCursor)
def IsFormattingCell(*args, **kwargs):
"""IsFormattingCell(self) -> bool"""
return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
@@ -765,7 +755,6 @@ class HtmlCell(_core.Object):
"""ConvertToText(self, HtmlSelection sel) -> String"""
return _html.HtmlCell_ConvertToText(*args, **kwargs)
Cursor = property(GetCursor,doc="See `GetCursor`")
Depth = property(GetDepth,doc="See `GetDepth`")
Descent = property(GetDescent,doc="See `GetDescent`")
FirstChild = property(GetFirstChild,doc="See `GetFirstChild`")
wxPython/src/gtk/html_wrap.cpp
-60
View File
@@ -4451,36 +4451,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
wxPyHtmlWindow *result = 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_wxHtmlWinParser, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWinParser_GetWindow" "', expected argument " "1"" of type '" "wxHtmlWinParser *""'");
}
arg1 = reinterpret_cast< wxHtmlWinParser * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPyHtmlWindow *)(arg1)->GetWindow();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_HtmlWinParser_GetWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
@@ -7280,34 +7250,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
wxCursor 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_wxHtmlCell, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetCursor" "', expected argument " "1"" of type '" "wxHtmlCell const *""'");
}
arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxHtmlCell const *)arg1)->GetCursor();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
@@ -17780,7 +17722,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWinParser_GetDC", (PyCFunction)_wrap_HtmlWinParser_GetDC, METH_O, NULL},
{ (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
{ (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
{ (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},
{ (char *)"HtmlWinParser_GetWindowInterface", (PyCFunction)_wrap_HtmlWinParser_GetWindowInterface, METH_O, NULL},
{ (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -17878,7 +17819,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
{ (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},
{ (char *)"HtmlCell_GetMouseCursor", (PyCFunction) _wrap_HtmlCell_GetMouseCursor, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
{ (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
{ (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"HtmlCell_SetNext", (PyCFunction) _wrap_HtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS, NULL},
wxPython/src/gtk/wizard_wrap.cpp
+6 -6
View File
@@ -2799,9 +2799,9 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
}
SWIGINTERN bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap=wxNullBitmap,wxString const &resource=wxPyEmptyString){
wxChar* res = NULL;
const wxChar* res = NULL;
if (resource.length())
res = (wxChar*)resource.c_str();
res = (const wxChar*)resource.c_str();
return self->Create(parent, bitmap, res);
}
// C++ Version of a Python aware class
@@ -2878,15 +2878,15 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWizardPage, wxWizardPage, RemoveChild);
SWIGINTERN wxPyWizardPage *new_wxPyWizardPage(wxWizard *parent,wxBitmap const *bitmap=&wxNullBitmap,wxString const *resource=&wxPyEmptyString){
wxChar* res = NULL;
const wxChar* res = NULL;
if (resource->length())
res = (wxChar*)resource->c_str();
res = (const wxChar*)resource->c_str();
return new wxPyWizardPage(parent, *bitmap, res);
}
SWIGINTERN bool wxPyWizardPage_Create(wxPyWizardPage *self,wxWizard *parent,wxBitmap const &bitmap=wxNullBitmap,wxString const &resource=wxPyEmptyString){
wxChar* res = NULL;
const wxChar* res = NULL;
if (resource.length())
res = (wxChar*)resource.c_str();
res = (const wxChar*)resource.c_str();
return self->Create(parent, bitmap, res);
}
#ifdef __cplusplus
wxPython/src/html.i
-7
View File
@@ -196,8 +196,6 @@ public:
wxDC* GetDC();
int GetCharHeight();
int GetCharWidth();
wxPyHtmlWindow* GetWindow();
%pythoncode { GetWindow = wx._deprecated(GetWindow) }
wxHtmlWindowInterface *GetWindowInterface();
@@ -576,10 +574,6 @@ public:
// Returns cursor to be used when mouse is over the cell:
virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const;
// Returns cursor to be used when mouse is over the cell:
wxCursor GetCursor() const;
%pythoncode { GetCursor = wx._deprecated(GetCursor) }
// Formatting cells are not visible on the screen, they only alter
// renderer's state.
bool IsFormattingCell() const;
@@ -651,7 +645,6 @@ public:
// only part of the cell inside the selection is converted.
wxString ConvertToText(wxHtmlSelection *sel) const;
%property(Cursor, GetCursor, doc="See `GetCursor`");
%property(Depth, GetDepth, doc="See `GetDepth`");
%property(Descent, GetDescent, doc="See `GetDescent`");
%property(FirstChild, GetFirstChild, doc="See `GetFirstChild`");
wxPython/src/mac/_controls.py
+5 -2
View File
@@ -1493,6 +1493,9 @@ TE_BESTWRAP = _controls_.TE_BESTWRAP
TE_RICH2 = _controls_.TE_RICH2
TE_CAPITALIZE = _controls_.TE_CAPITALIZE
TE_LINEWRAP = TE_CHARWRAP
PROCESS_ENTER = TE_PROCESS_ENTER
PASSWORD = TE_PASSWORD
TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
@@ -3771,11 +3774,11 @@ class ToolBarBase(_core.Control):
return _controls_.ToolBarBase_InsertToolItem(*args, **kwargs)
def AddControl(*args, **kwargs):
"""AddControl(self, Control control) -> ToolBarToolBase"""
"""AddControl(self, Control control, String label=wxEmptyString) -> ToolBarToolBase"""
return _controls_.ToolBarBase_AddControl(*args, **kwargs)
def InsertControl(*args, **kwargs):
"""InsertControl(self, size_t pos, Control control) -> ToolBarToolBase"""
"""InsertControl(self, size_t pos, Control control, String label=wxEmptyString) -> ToolBarToolBase"""
return _controls_.ToolBarBase_InsertControl(*args, **kwargs)
def FindControl(*args, **kwargs):
wxPython/src/mac/_controls_wrap.cpp
+44 -6
View File
@@ -24190,18 +24190,22 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_AddControl(PyObject *SWIGUNUSEDPARM(self)
PyObject *resultobj = 0;
wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
wxControl *arg2 = (wxControl *) 0 ;
wxString const &arg3_defvalue = wxEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
wxToolBarToolBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
bool temp3 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "control", NULL
(char *) "self",(char *) "control",(char *) "label", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_AddControl",kwnames,&obj0,&obj1)) SWIG_fail;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ToolBarBase_AddControl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBarBase, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBarBase_AddControl" "', expected argument " "1"" of type '" "wxToolBarBase *""'");
@@ -24212,17 +24216,32 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_AddControl(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ToolBarBase_AddControl" "', expected argument " "2"" of type '" "wxControl *""'");
}
arg2 = reinterpret_cast< wxControl * >(argp2);
if (obj2) {
{
arg3 = wxString_in_helper(obj2);
if (arg3 == NULL) SWIG_fail;
temp3 = true;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxToolBarToolBase *)(arg1)->AddControl(arg2);
result = (wxToolBarToolBase *)(arg1)->AddControl(arg2,(wxString const &)*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
{
if (temp3)
delete arg3;
}
return resultobj;
fail:
{
if (temp3)
delete arg3;
}
return NULL;
}
@@ -24232,6 +24251,8 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
size_t arg2 ;
wxControl *arg3 = (wxControl *) 0 ;
wxString const &arg4_defvalue = wxEmptyString ;
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxToolBarToolBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -24239,14 +24260,16 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
int ecode2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
bool temp4 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "pos",(char *) "control", NULL
(char *) "self",(char *) "pos",(char *) "control",(char *) "label", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBarBase, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBarBase_InsertControl" "', expected argument " "1"" of type '" "wxToolBarBase *""'");
@@ -24262,17 +24285,32 @@ SWIGINTERN PyObject *_wrap_ToolBarBase_InsertControl(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBarBase_InsertControl" "', expected argument " "3"" of type '" "wxControl *""'");
}
arg3 = reinterpret_cast< wxControl * >(argp3);
if (obj3) {
{
arg4 = wxString_in_helper(obj3);
if (arg4 == NULL) SWIG_fail;
temp4 = true;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxToolBarToolBase *)(arg1)->InsertControl(arg2,arg3);
result = (wxToolBarToolBase *)(arg1)->InsertControl(arg2,arg3,(wxString const &)*arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
{
if (temp4)
delete arg4;
}
return resultobj;
fail:
{
if (temp4)
delete arg4;
}
return NULL;
}
wxPython/src/mac/_core.py
+304 -17
View File
@@ -116,8 +116,6 @@ LB_MULTIPLE = _core_.LB_MULTIPLE
LB_EXTENDED = _core_.LB_EXTENDED
LB_OWNERDRAW = _core_.LB_OWNERDRAW
LB_HSCROLL = _core_.LB_HSCROLL
PROCESS_ENTER = _core_.PROCESS_ENTER
PASSWORD = _core_.PASSWORD
CB_SIMPLE = _core_.CB_SIMPLE
CB_DROPDOWN = _core_.CB_DROPDOWN
CB_SORT = _core_.CB_SORT
@@ -334,7 +332,7 @@ EXPAND = _core_.EXPAND
SHAPED = _core_.SHAPED
FIXED_MINSIZE = _core_.FIXED_MINSIZE
TILE = _core_.TILE
ADJUST_MINSIZE = _core_.ADJUST_MINSIZE
ADJUST_MINSIZE = 0
BORDER_DEFAULT = _core_.BORDER_DEFAULT
BORDER_NONE = _core_.BORDER_NONE
BORDER_STATIC = _core_.BORDER_STATIC
@@ -416,8 +414,6 @@ WXK_CONTROL = _core_.WXK_CONTROL
WXK_MENU = _core_.WXK_MENU
WXK_PAUSE = _core_.WXK_PAUSE
WXK_CAPITAL = _core_.WXK_CAPITAL
WXK_PRIOR = _core_.WXK_PRIOR
WXK_NEXT = _core_.WXK_NEXT
WXK_END = _core_.WXK_END
WXK_HOME = _core_.WXK_HOME
WXK_LEFT = _core_.WXK_LEFT
@@ -486,9 +482,7 @@ WXK_NUMPAD_LEFT = _core_.WXK_NUMPAD_LEFT
WXK_NUMPAD_UP = _core_.WXK_NUMPAD_UP
WXK_NUMPAD_RIGHT = _core_.WXK_NUMPAD_RIGHT
WXK_NUMPAD_DOWN = _core_.WXK_NUMPAD_DOWN
WXK_NUMPAD_PRIOR = _core_.WXK_NUMPAD_PRIOR
WXK_NUMPAD_PAGEUP = _core_.WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = _core_.WXK_NUMPAD_NEXT
WXK_NUMPAD_PAGEDOWN = _core_.WXK_NUMPAD_PAGEDOWN
WXK_NUMPAD_END = _core_.WXK_NUMPAD_END
WXK_NUMPAD_BEGIN = _core_.WXK_NUMPAD_BEGIN
@@ -525,6 +519,11 @@ WXK_SPECIAL17 = _core_.WXK_SPECIAL17
WXK_SPECIAL18 = _core_.WXK_SPECIAL18
WXK_SPECIAL19 = _core_.WXK_SPECIAL19
WXK_SPECIAL20 = _core_.WXK_SPECIAL20
WXK_PRIOR = WXK_PAGEUP
WXK_NEXT = WXK_PAGEDOWN
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN
PAPER_NONE = _core_.PAPER_NONE
PAPER_LETTER = _core_.PAPER_LETTER
PAPER_LEGAL = _core_.PAPER_LEGAL
@@ -4581,7 +4580,7 @@ class ScrollEvent(CommandEvent):
"""
A scroll event holds information about events sent from stand-alone
scrollbars and sliders. Note that scrolled windows do not send
instnaces of this event class, but send the `wx.ScrollWinEvent`
instances of this event class, but send the `wx.ScrollWinEvent`
instead.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -8124,10 +8123,11 @@ class AcceleratorTable(Object):
Ok = IsOk
_core_.AcceleratorTable_swigregister(AcceleratorTable)
def GetAccelFromString(label):
entry = AcceleratorEntry()
entry.FromString(label)
return entry
def GetAccelFromString(*args, **kwargs):
"""GetAccelFromString(String label) -> AcceleratorEntry"""
return _core_.GetAccelFromString(*args, **kwargs)
#---------------------------------------------------------------------------
class VisualAttributes(object):
@@ -8909,9 +8909,21 @@ class Window(EvtHandler):
IsEnabled(self) -> bool
Returns true if the window is enabled for input, false otherwise.
This method takes into account the enabled state of parent windows up
to the top-level window.
"""
return _core_.Window_IsEnabled(*args, **kwargs)
def IsThisEnabled(*args, **kwargs):
"""
IsThisEnabled(self) -> bool
Returns the internal enabled state independent of the parent(s) state,
i.e. the state in which the window would be if all of its parents are
enabled. Use `IsEnabled` to get the effective window state.
"""
return _core_.Window_IsThisEnabled(*args, **kwargs)
def IsShownOnScreen(*args, **kwargs):
"""
IsShownOnScreen(self) -> bool
@@ -9056,6 +9068,14 @@ class Window(EvtHandler):
"""
return _core_.Window_AcceptsFocus(*args, **kwargs)
def CanAcceptFocus(*args, **kwargs):
"""
CanAcceptFocus(self) -> bool
Can this window have focus right now?
"""
return _core_.Window_CanAcceptFocus(*args, **kwargs)
def AcceptsFocusFromKeyboard(*args, **kwargs):
"""
AcceptsFocusFromKeyboard(self) -> bool
@@ -9066,12 +9086,28 @@ class Window(EvtHandler):
"""
return _core_.Window_AcceptsFocusFromKeyboard(*args, **kwargs)
def CanAcceptFocusFromKeyboard(*args, **kwargs):
"""
CanAcceptFocusFromKeyboard(self) -> bool
Can this window be assigned focus from keyboard right now?
"""
return _core_.Window_CanAcceptFocusFromKeyboard(*args, **kwargs)
def NavigateIn(*args, **kwargs):
"""
NavigateIn(self, int flags=NavigationKeyEvent.IsForward) -> bool
Navigates inside this window.
"""
return _core_.Window_NavigateIn(*args, **kwargs)
def Navigate(*args, **kwargs):
"""
Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool
Does keyboard navigation from this window to another, by sending a
`wx.NavigationKeyEvent`.
Does keyboard navigation starting from this window to another. This is
equivalient to self.GetParent().NavigateIn().
"""
return _core_.Window_Navigate(*args, **kwargs)
@@ -9127,6 +9163,14 @@ class Window(EvtHandler):
"""
return _core_.Window_GetGrandParent(*args, **kwargs)
def GetTopLevelParent(*args, **kwargs):
"""
GetTopLevelParent(self) -> Window
Returns the first frame or dialog in this window's parental hierarchy.
"""
return _core_.Window_GetTopLevelParent(*args, **kwargs)
def IsTopLevel(*args, **kwargs):
"""
IsTopLevel(self) -> bool
@@ -10423,6 +10467,7 @@ class Window(EvtHandler):
Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`")
ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`")
GrandParent = property(GetGrandParent,doc="See `GetGrandParent`")
TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`")
Handle = property(GetHandle,doc="See `GetHandle`")
HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`")
Id = property(GetId,SetId,doc="See `GetId` and `SetId`")
@@ -11066,7 +11111,6 @@ class MenuBar(Window):
self.Append(m, l)
Frame = property(GetFrame,doc="See `GetFrame`")
Menu = property(GetMenu,doc="See `GetMenu`")
MenuCount = property(GetMenuCount,doc="See `GetMenuCount`")
Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`")
_core_.MenuBar_swigregister(MenuBar)
@@ -11601,6 +11645,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems)
#---------------------------------------------------------------------------
class SizerFlags(object):
"""
Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
to specify a lot of flags and parameters which can be unwieldy. This
is where wx.SizerFlags comes in: it allows you to specify all
parameters using the named methods instead. For example, instead of::
sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
you can now write::
sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
This is more readable and also allows you to create wx.SizerFlags
objects which can be reused for several sizer items.::
flagsExpand = wx.SizerFlags(1)
flagsExpand.Expand().Border(wx.ALL, 10)
sizer.AddF(ctrl1, flagsExpand)
sizer.AddF(ctrl2, flagsExpand)
Note that by specification, all methods of wx.SizerFlags return the
wx.SizerFlags object itself allowing chaining multiple method calls
like in the examples above.
"""
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 proportion=0) -> SizerFlags
Constructs the flags object with the specified proportion.
"""
_core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs))
__swig_destroy__ = _core_.delete_SizerFlags
__del__ = lambda self : None;
def Proportion(*args, **kwargs):
"""
Proportion(self, int proportion) -> SizerFlags
Sets the item's proportion value.
"""
return _core_.SizerFlags_Proportion(*args, **kwargs)
def Align(*args, **kwargs):
"""
Align(self, int alignment) -> SizerFlags
Sets the item's alignment
"""
return _core_.SizerFlags_Align(*args, **kwargs)
def Expand(*args, **kwargs):
"""
Expand(self) -> SizerFlags
Sets the wx.EXPAND flag, which will cause the item to be expanded to
fill as much space as it is given by the sizer.
"""
return _core_.SizerFlags_Expand(*args, **kwargs)
def Centre(*args, **kwargs):
"""
Centre(self) -> SizerFlags
Same as `Center` for those with an alternate dialect of English.
"""
return _core_.SizerFlags_Centre(*args, **kwargs)
def Center(*args, **kwargs):
"""
Center(self) -> SizerFlags
Sets the centering alignment flags.
"""
return _core_.SizerFlags_Center(*args, **kwargs)
def Left(*args, **kwargs):
"""
Left(self) -> SizerFlags
Aligns the object to the left, a shortcut for calling
Align(wx.ALIGN_LEFT)
"""
return _core_.SizerFlags_Left(*args, **kwargs)
def Right(*args, **kwargs):
"""
Right(self) -> SizerFlags
Aligns the object to the right, a shortcut for calling
Align(wx.ALIGN_RIGHT)
"""
return _core_.SizerFlags_Right(*args, **kwargs)
def Top(*args, **kwargs):
"""
Top(self) -> SizerFlags
Aligns the object to the top of the available space, a shortcut for
calling Align(wx.ALIGN_TOP)
"""
return _core_.SizerFlags_Top(*args, **kwargs)
def Bottom(*args, **kwargs):
"""
Bottom(self) -> SizerFlags
Aligns the object to the bottom of the available space, a shortcut for
calling Align(wx.ALIGN_BOTTOM)
"""
return _core_.SizerFlags_Bottom(*args, **kwargs)
def Shaped(*args, **kwargs):
"""
Shaped(self) -> SizerFlags
Sets the wx.SHAPED flag.
"""
return _core_.SizerFlags_Shaped(*args, **kwargs)
def FixedMinSize(*args, **kwargs):
"""
FixedMinSize(self) -> SizerFlags
Sets the wx.FIXED_MINSIZE flag.
"""
return _core_.SizerFlags_FixedMinSize(*args, **kwargs)
def Border(*args, **kwargs):
"""
Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags
Sets the border of the item in the direction(s) or sides given by the
direction parameter. If the borderInPixels value is not given then
the default border size (see `GetDefaultBorder`) will be used.
"""
return _core_.SizerFlags_Border(*args, **kwargs)
def DoubleBorder(*args, **kwargs):
"""
DoubleBorder(self, int direction=ALL) -> SizerFlags
Sets the border in the given direction to twice the default border
size.
"""
return _core_.SizerFlags_DoubleBorder(*args, **kwargs)
def TripleBorder(*args, **kwargs):
"""
TripleBorder(self, int direction=ALL) -> SizerFlags
Sets the border in the given direction to three times the default
border size.
"""
return _core_.SizerFlags_TripleBorder(*args, **kwargs)
def HorzBorder(*args, **kwargs):
"""
HorzBorder(self) -> SizerFlags
Sets the left and right borders to the default border size.
"""
return _core_.SizerFlags_HorzBorder(*args, **kwargs)
def DoubleHorzBorder(*args, **kwargs):
"""
DoubleHorzBorder(self) -> SizerFlags
Sets the left and right borders to twice the default border size.
"""
return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs)
def GetDefaultBorder(*args, **kwargs):
"""
GetDefaultBorder() -> int
Returns the default border size used by the other border methods
"""
return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs)
GetDefaultBorder = staticmethod(GetDefaultBorder)
def GetProportion(*args, **kwargs):
"""
GetProportion(self) -> int
Returns the proportion value to be used in the sizer item.
"""
return _core_.SizerFlags_GetProportion(*args, **kwargs)
def GetFlags(*args, **kwargs):
"""
GetFlags(self) -> int
Returns the flags value to be used in the sizer item.
"""
return _core_.SizerFlags_GetFlags(*args, **kwargs)
def GetBorderInPixels(*args, **kwargs):
"""
GetBorderInPixels(self) -> int
Returns the border value in pixels to be used in the sizer item.
"""
return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs)
_core_.SizerFlags_swigregister(SizerFlags)
def SizerFlags_GetDefaultBorder(*args):
"""
SizerFlags_GetDefaultBorder() -> int
Returns the default border size used by the other border methods
"""
return _core_.SizerFlags_GetDefaultBorder(*args)
class SizerItem(Object):
"""
The wx.SizerItem class is used to track the position, size and other
@@ -11996,6 +12256,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Add(*args, **kwargs)
def AddF(*args, **kwargs):
"""
AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Add` but uses the `wx.SizerFlags` convenience class for
setting the various flags, options and borders.
"""
return _core_.Sizer_AddF(*args, **kwargs)
def Insert(*args, **kwargs):
"""
Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -12006,6 +12275,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Insert(*args, **kwargs)
def InsertF(*args, **kwargs):
"""
InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.
"""
return _core_.Sizer_InsertF(*args, **kwargs)
def Prepend(*args, **kwargs):
"""
Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -12016,6 +12294,15 @@ class Sizer(Object):
"""
return _core_.Sizer_Prepend(*args, **kwargs)
def PrependF(*args, **kwargs):
"""
PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem
Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
for setting the various flags, options and borders.
"""
return _core_.Sizer_PrependF(*args, **kwargs)
def Remove(*args, **kwargs):
"""
Remove(self, item) -> bool
@@ -12043,7 +12330,7 @@ class Sizer(Object):
def GetItem(*args, **kwargs):
"""
GetItem(self, item) -> wx.SizerItem
GetItem(self, item, recursive=False) -> wx.SizerItem
Returns the `wx.SizerItem` which holds the *item* given. The *item*
parameter can be either a window, a sizer, or the zero-based index of
@@ -12083,9 +12370,9 @@ class Sizer(Object):
"""
if isinstance(olditem, wx.Window):
return self._ReplaceWin(olditem, item, recursive)
elif isinstnace(olditem, wx.Sizer):
elif isinstance(olditem, wx.Sizer):
return self._ReplaceSizer(olditem, item, recursive)
elif isinstnace(olditem, int):
elif isinstance(olditem, int):
return self._ReplaceItem(olditem, item)
else:
raise TypeError("Expected Window, Sizer, or integer for first parameter.")
wxPython/src/mac/_core_wrap.cpp
+1368 -213
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/_gdi.py
+48 -51
View File
@@ -676,7 +676,7 @@ class Bitmap(GDIObject):
CopyFromBuffer(self, buffer data)
Copy data from a RGB buffer object to replace the bitmap pixel data.
See `wxBitmapFromBuffer` for more .
See `wx.BitmapFromBuffer` for more .
"""
return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
@@ -685,7 +685,7 @@ class Bitmap(GDIObject):
CopyFromBufferRGBA(self, buffer data)
Copy data from a RGBA buffer object to replace the bitmap pixel data.
See `wxBitmapFromBufferRGBA` for more .
See `wx.BitmapFromBufferRGBA` for more .
"""
return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
@@ -2633,9 +2633,8 @@ class Locale(object):
__del__ = lambda self : None;
def Init1(*args, **kwargs):
"""
Init1(self, String szName, String szShort=EmptyString, String szLocale=EmptyString,
bool bLoadDefault=True,
bool bConvertEncoding=False) -> bool
Init1(self, String name, String shortName=EmptyString, String locale=EmptyString,
bool bLoadDefault=True, bool bConvertEncoding=False) -> bool
"""
return _gdi_.Locale_Init1(*args, **kwargs)
@@ -2692,7 +2691,7 @@ class Locale(object):
AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
def AddCatalog(*args, **kwargs):
"""AddCatalog(self, String szDomain) -> bool"""
"""AddCatalog(self, String domain) -> bool"""
return _gdi_.Locale_AddCatalog(*args, **kwargs)
def IsAvailable(*args, **kwargs):
@@ -2701,7 +2700,7 @@ class Locale(object):
IsAvailable = staticmethod(IsAvailable)
def IsLoaded(*args, **kwargs):
"""IsLoaded(self, String szDomain) -> bool"""
"""IsLoaded(self, String domain) -> bool"""
return _gdi_.Locale_IsLoaded(*args, **kwargs)
def GetLanguageInfo(*args, **kwargs):
@@ -2725,7 +2724,7 @@ class Locale(object):
AddLanguage = staticmethod(AddLanguage)
def GetString(*args, **kwargs):
"""GetString(self, String szOrigString, String szDomain=EmptyString) -> String"""
"""GetString(self, String origString, String domain=EmptyString) -> String"""
return _gdi_.Locale_GetString(*args, **kwargs)
def GetName(*args, **kwargs):
@@ -2792,14 +2791,11 @@ class PyLocale(Locale):
return _gdi_.PyLocale__setCallbackInfo(*args, **kwargs)
def GetSingularString(*args, **kwargs):
"""GetSingularString(self, wxChar szOrigString, wxChar szDomain=None) -> wxChar"""
"""GetSingularString(self, String origString, String domain=EmptyString) -> String"""
return _gdi_.PyLocale_GetSingularString(*args, **kwargs)
def GetPluralString(*args, **kwargs):
"""
GetPluralString(self, wxChar szOrigString, wxChar szOrigString2, size_t n,
wxChar szDomain=None) -> wxChar
"""
"""GetPluralString(self, String origString, String origString2, size_t n, String domain=EmptyString) -> String"""
return _gdi_.PyLocale_GetPluralString(*args, **kwargs)
_gdi_.PyLocale_swigregister(PyLocale)
@@ -3384,6 +3380,35 @@ class DC(_core.Object):
"""
return _gdi_.DC_BlitPointSize(*args, **kwargs)
def StretchBlit(*args, **kwargs):
"""
StretchBlit(self, int dstX, int dstY, int dstWidth, int dstHeight, DC source,
int srcX, int srcY, int srcWidth, int srcHeight,
int rop=COPY, bool useMask=False,
int srcMaskX=wxDefaultCoord, int srcMaskY=wxDefaultCoord) -> bool
Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position.
"""
return _gdi_.DC_StretchBlit(*args, **kwargs)
def StretchBlitPointSize(*args, **kwargs):
"""
StretchBlitPointSize(self, Point dstPt, Size dstSize, DC source, Point srcPt,
Size srcSize, int rop=COPY, bool useMask=False,
Point srcMaskPt=DefaultPosition) -> bool
Copy from a source DC to this DC, specifying the destination
coordinates, destination size, source DC, source coordinates, size of
source area to copy, logical function, whether to use a bitmap mask,
and mask source position. This version is the same as `StretchBlit`
except `wx.Point` and `wx.Size` objects are used instead of individual
position and size components.
"""
return _gdi_.DC_StretchBlitPointSize(*args, **kwargs)
def GetAsBitmap(*args, **kwargs):
"""GetAsBitmap(self, Rect subrect=None) -> Bitmap"""
return _gdi_.DC_GetAsBitmap(*args, **kwargs)
@@ -4692,6 +4717,7 @@ def MemoryDCFromDC(*args, **kwargs):
BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA
BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA
BUFFER_USES_SHARED_BUFFER = _gdi_.BUFFER_USES_SHARED_BUFFER
class BufferedDC(MemoryDC):
"""
This simple class provides a simple way to avoid flicker: when drawing
@@ -5418,7 +5444,8 @@ class GraphicsContext(GraphicsObject):
Creates a wx.GraphicsContext from a native context. This native
context must be eg a CGContextRef for Core Graphics, a Graphics
pointer for GDIPlus or a cairo_t pointer for Cairo.
pointer for GDIPlus or a cairo_t pointer for Cairo. NOTE: For
wxPython we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
@@ -5427,7 +5454,8 @@ class GraphicsContext(GraphicsObject):
"""
CreateFromNativeWindow(void window) -> GraphicsContext
Creates a wx.GraphicsContext from a native window.
Creates a wx.GraphicsContext from a native window. NOTE: For wxPython
we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
@@ -5746,7 +5774,7 @@ class GraphicsContext(GraphicsObject):
def StrokeLineSegements(*args, **kwargs):
"""
StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
StrokeLineSegments(self, List beginPoints, List endPoints)
Stroke disconnected lines from begin to end points
"""
@@ -5827,7 +5855,8 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
Creates a wx.GraphicsContext from a native context. This native
context must be eg a CGContextRef for Core Graphics, a Graphics
pointer for GDIPlus or a cairo_t pointer for Cairo.
pointer for GDIPlus or a cairo_t pointer for Cairo. NOTE: For
wxPython we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
@@ -5835,7 +5864,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
"""
GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
Creates a wx.GraphicsContext from a native window.
Creates a wx.GraphicsContext from a native window. NOTE: For wxPython
we still need a way to make this value usable.
"""
return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
@@ -6265,17 +6295,6 @@ class PenList(GDIObjListBase):
"""FindOrCreatePen(self, Colour colour, int width, int style) -> Pen"""
return _gdi_.PenList_FindOrCreatePen(*args, **kwargs)
def AddPen(*args, **kwargs):
"""AddPen(self, Pen pen)"""
return _gdi_.PenList_AddPen(*args, **kwargs)
def RemovePen(*args, **kwargs):
"""RemovePen(self, Pen pen)"""
return _gdi_.PenList_RemovePen(*args, **kwargs)
AddPen = wx._deprecated(AddPen)
RemovePen = wx._deprecated(RemovePen)
_gdi_.PenList_swigregister(PenList)
class BrushList(GDIObjListBase):
@@ -6287,17 +6306,6 @@ class BrushList(GDIObjListBase):
"""FindOrCreateBrush(self, Colour colour, int style=SOLID) -> Brush"""
return _gdi_.BrushList_FindOrCreateBrush(*args, **kwargs)
def AddBrush(*args, **kwargs):
"""AddBrush(self, Brush brush)"""
return _gdi_.BrushList_AddBrush(*args, **kwargs)
def RemoveBrush(*args, **kwargs):
"""RemoveBrush(self, Brush brush)"""
return _gdi_.BrushList_RemoveBrush(*args, **kwargs)
AddBrush = wx._deprecated(AddBrush)
RemoveBrush = wx._deprecated(RemoveBrush)
_gdi_.BrushList_swigregister(BrushList)
class FontList(GDIObjListBase):
@@ -6313,17 +6321,6 @@ class FontList(GDIObjListBase):
"""
return _gdi_.FontList_FindOrCreateFont(*args, **kwargs)
def AddFont(*args, **kwargs):
"""AddFont(self, Font font)"""
return _gdi_.FontList_AddFont(*args, **kwargs)
def RemoveFont(*args, **kwargs):
"""RemoveFont(self, Font font)"""
return _gdi_.FontList_RemoveFont(*args, **kwargs)
AddFont = wx._deprecated(AddFont)
RemoveFont = wx._deprecated(RemoveFont)
_gdi_.FontList_swigregister(FontList)
class ColourDatabase(object):
wxPython/src/mac/_gdi_wrap.cpp
+567 -487
View File
File diff suppressed because it is too large Load Diff

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