Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back
some things that were changed/removed from my patch I submitted to them.) Since it is now possible easily and simply share the SWIG type tables across modules I reverted to always using the stock SWIG runtime instead of my slightly hacked up version of it exported via the wxPython C API. The %name directive is now deprecated so replaced most uses of it with a custom %Rename macro that uses %rename internally. These will evetually need to be replaced with a DocDecl macro when docstrings are added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,8 +51,9 @@ methods are called.
|
||||
int border, PyObject* userData=NULL ),
|
||||
"Constructs a `wx.SizerItem` for tracking a window.", "");
|
||||
|
||||
%name(SizerItemWindow) wxSizerItem( wxWindow *window, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL ) {
|
||||
%RenameCtor(SizerItemWindow, wxSizerItem( wxWindow *window, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL ))
|
||||
{
|
||||
wxPyUserData* data = NULL;
|
||||
if ( userData ) {
|
||||
bool blocked = wxPyBeginBlockThreads();
|
||||
@@ -67,8 +68,10 @@ methods are called.
|
||||
wxSizerItem( int width, int height, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL),
|
||||
"Constructs a `wx.SizerItem` for tracking a spacer.", "");
|
||||
%name(SizerItemSpacer) wxSizerItem( int width, int height, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL) {
|
||||
|
||||
%RenameCtor(SizerItemSpacer, wxSizerItem( int width, int height, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL))
|
||||
{
|
||||
wxPyUserData* data = NULL;
|
||||
if ( userData ) {
|
||||
bool blocked = wxPyBeginBlockThreads();
|
||||
@@ -81,9 +84,11 @@ methods are called.
|
||||
DocStr(
|
||||
wxSizerItem( wxSizer *sizer, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL ),
|
||||
"Constructs a `wx.SizerItem` for tracking a subsizer", "");
|
||||
%name(SizerItemSizer) wxSizerItem( wxSizer *sizer, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL ) {
|
||||
"Constructs a `wx.SizerItem` for tracking a subsizer", "");
|
||||
|
||||
%RenameCtor(SizerItemSizer, wxSizerItem( wxSizer *sizer, int proportion, int flag,
|
||||
int border, PyObject* userData=NULL ))
|
||||
{
|
||||
wxPyUserData* data = NULL;
|
||||
if ( userData ) {
|
||||
bool blocked = wxPyBeginBlockThreads();
|
||||
@@ -139,8 +144,8 @@ added, if needed.", "");
|
||||
|
||||
DocStr(SetRatio,
|
||||
"Set the ratio item attribute.", "");
|
||||
%name(SetRatioWH) void SetRatio( int width, int height );
|
||||
%name(SetRatioSize) void SetRatio( wxSize size );
|
||||
%Rename(SetRatioWH, void, SetRatio( int width, int height ));
|
||||
%Rename(SetRatioSize, void, SetRatio( wxSize size ));
|
||||
void SetRatio( float ratio );
|
||||
|
||||
DocDeclStr(
|
||||
|
Reference in New Issue
Block a user