From 9b3d3bc44bee290fc5b34279adb60156f28689d3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 23 Dec 1999 20:05:08 +0000 Subject: [PATCH] New toolbar wrappers wxMask demos GenericButton now derives from wxControl Lots of small changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/CHANGES.txt | 33 +- utils/wxPython/buildall.bat | 6 +- utils/wxPython/demo/Main.py | 12 +- utils/wxPython/demo/bitmaps/test_image.png | Bin 0 -> 2405 bytes utils/wxPython/demo/bitmaps/test_mask.bmp | Bin 0 -> 1024 bytes utils/wxPython/demo/bitmaps/tog2.bmp | Bin 238 -> 238 bytes utils/wxPython/demo/wxButton.py | 7 +- utils/wxPython/demo/wxMask.py | 103 + utils/wxPython/demo/wxToolBar.py | 26 +- utils/wxPython/demo/wxTreeCtrl.py | 16 +- utils/wxPython/lib/buttons.py | 7 +- utils/wxPython/src/.cvsignore | 2 + utils/wxPython/src/_defs.i | 1 + utils/wxPython/src/controls.i | 42 +- utils/wxPython/src/gdi.i | 4 + utils/wxPython/src/helpers.h | 33 +- utils/wxPython/src/image.i | 6 + utils/wxPython/src/misc.i | 39 + utils/wxPython/src/msw/clip_dnd.cpp | 2 - utils/wxPython/src/msw/cmndlgs.cpp | 8 +- utils/wxPython/src/msw/controls.cpp | 123 +- utils/wxPython/src/msw/controls.py | 7 + utils/wxPython/src/msw/controls2.cpp | 2 - utils/wxPython/src/msw/frames.cpp | 8 +- utils/wxPython/src/msw/gdi.cpp | 1362 +++++++---- utils/wxPython/src/msw/gdi.py | 142 +- utils/wxPython/src/msw/image.cpp | 40 + utils/wxPython/src/msw/image.py | 14 + utils/wxPython/src/msw/mdi.cpp | 8 +- utils/wxPython/src/msw/misc.py | 38 + utils/wxPython/src/msw/printfw.cpp | 8 +- utils/wxPython/src/msw/sizers.cpp | 128 +- utils/wxPython/src/msw/sizers.py | 12 + utils/wxPython/src/msw/stattool.cpp | 2563 +++++++++++--------- utils/wxPython/src/msw/stattool.py | 374 +-- utils/wxPython/src/msw/windows.cpp | 2 - utils/wxPython/src/msw/windows3.cpp | 8 +- utils/wxPython/src/msw/wx.cpp | 11 +- utils/wxPython/src/msw/wx.py | 13 +- utils/wxPython/src/sizers.i | 19 +- utils/wxPython/src/stattool.i | 248 +- utils/wxPython/src/windows.i | 4 +- 42 files changed, 3644 insertions(+), 1837 deletions(-) create mode 100644 utils/wxPython/demo/bitmaps/test_image.png create mode 100644 utils/wxPython/demo/bitmaps/test_mask.bmp create mode 100644 utils/wxPython/demo/wxMask.py diff --git a/utils/wxPython/CHANGES.txt b/utils/wxPython/CHANGES.txt index a32a1f28ab..584db3b1ad 100644 --- a/utils/wxPython/CHANGES.txt +++ b/utils/wxPython/CHANGES.txt @@ -30,7 +30,7 @@ rectangle representing the intersection is returned. Some bug fixes for Clipboard and Drag-n-Drop. -Rotated text!!! WooHoo! (See wxDC.DrawRotatedtext()) +Rotated text!!! WooHoo! (See wxDC.DrawRotatedText()) Added a set of Generic Buttons to the library. These are simple window classes that look and act like native buttons, but you can have @@ -38,6 +38,37 @@ a bit more control over them. The bezel width can be set in addition to colours, fonts, etc. There is a ToggleButton as well as Bitmap versions too. +The C++ wxToolBar classes have been redone, and so have the wxPython +wrappers. There have been slight modifications to some of the methods +but shouldn't impact anybody too much. I took the opportunity to add +support for setting user data on each toolbar tool. The new AddTool +methods look like this: + + def AddTool(ID, + bitmap, + pushedBitmap = wxNullBitmap, + toggle = FALSE, + clientData = NULL, + shortHelpString = "", + longHelpString = "") + + def AddSimpleTool(ID, + bitmap, + shortHelpString = "", + longHelpString = "", + toggle=FALSE) + + +There are also coresponding InsertTool and InsertSimpleTool methods +that additionally take an integer position as the first parameter. + +Added a wrapper for the PCX and TIFF ImageHandlers. + +wxRect now simulates attributes named left, right, top and bottom. + + + + What's new in 2.1.11 diff --git a/utils/wxPython/buildall.bat b/utils/wxPython/buildall.bat index 87de38f028..0747662fa4 100755 --- a/utils/wxPython/buildall.bat +++ b/utils/wxPython/buildall.bat @@ -1,10 +1,10 @@ -cd %WXWIN%\utils\wxPython\src +cd src python ..\distrib\build.py %1 %2 %3 %4 %5 %6 %7 %8 %9 -cd %WXWIN%\utils\wxPython\modules +cd ..\modules python .\buildall.py %1 %2 %3 %4 %5 %6 %7 %8 %9 -cd %WXWIN%\utils\wxPython +cd .. diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py index d9483a9e51..1030ed5d73 100644 --- a/utils/wxPython/demo/Main.py +++ b/utils/wxPython/demo/Main.py @@ -22,14 +22,14 @@ _useNestedSplitter = true _treeList = [ ('New since last release', ['wxMVCTree', 'wxVTKRenderWindow', - 'FileBrowseButton', #'wxToggleButton', - 'GenericButtons']), + 'FileBrowseButton', 'GenericButtons', + 'wxMask']), ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']), ('Non-Managed Windows', ['wxGrid', 'wxSashWindow', 'wxScrolledWindow', 'wxSplitterWindow', - 'wxStatusBar', 'wxToolBar', 'wxNotebook', + 'wxStatusBar', 'wxNotebook', 'wxHtmlWindow']), ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog', @@ -40,15 +40,15 @@ _treeList = [ ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice', 'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl', 'wxTreeCtrl', 'wxSpinButton', 'wxStaticText', 'wxStaticBitmap', - 'wxRadioBox', 'wxSlider', #'wxToggleButton' + 'wxRadioBox', 'wxSlider', 'wxToolBar', #'wxToggleButton' ]), ('Window Layout', ['wxLayoutConstraints', 'Sizers', 'OldSizers']), ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator', 'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits', - 'wxImage', 'PrintFramework', 'wxOGL', 'PythonEvents', - 'Threads']), + 'wxImage', 'wxMask', 'PrintFramework', 'wxOGL', + 'PythonEvents', 'Threads']), ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', 'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar', diff --git a/utils/wxPython/demo/bitmaps/test_image.png b/utils/wxPython/demo/bitmaps/test_image.png new file mode 100644 index 0000000000000000000000000000000000000000..0d746b5be4233d177679b088cfff68eff98cf518 GIT binary patch literal 2405 zcmV-r37YnaP)zckgb3aM!bIceA6>X!c%vcYgPO z&Y5#&ZElQVmr@h+y?`!o7q|=D1?~cOfxEz$PU`}9db{L+!+H7CGtb=50{rmBJ>O{a zN6&-8XQsy)H;Ydl!TG8CJ0F+>?a4=&W{aOc(*94MCm%K!nRP5MPeFp(9S(eM`aUKM zKqvHPU;I=j19Q&aIej#Fx#%z7WbGBX?Iz9RE|}Aq&+#1>Fz_4G2UuY6GesTqnU@cC zCNS9ZJEo4+(F(Tc)o-=arrT@MLCk4^W9D|o>UJxPA4o~11Exn{+PI4Lebm4IP~;Xh zh-njM#$NyXeVqmj^1l7VF~qajVGaI@b4S}|(`^J!{sBHUXdibCHV_ZKhuBkiDyNRJTRsW)1+VPmP(><1##cZq_n`_zHCsaJa}rcKL57 zSgu~-GL%)o<2_WUD=i^B>9xtTLG#WNQLa(CT zI_o8?W)X3MZ7X~V0Lf{>aRR^$M=<7(zi*#mrnsTl65wFn1T0Yv?XR)rV(eUsJeLA) zzz$OrcqCK#@5d&$Tu0KgWd^PuKGx< za|3x=-h}z0@L4qGswRaEk4LL*jA|nm65@4f)i#d&*7p{n{<^n+e75E}m%s5)&yGRF z3Z9;<6+l6%H$xSuPBU3GdN)ojmkK;6S$7?iAD-h5V|BQOEGx$0i`fL z?_2lj*{^v{z{vdk7z+NINxLD{#jS?umAN2#RTpB6-&fqNnY=M01FqM`-R!e$FrjbhRS#xfbXRhw+s z-gQQPYRCLvd)d`J=x%v%PLY-jO9e@g^{owe1ckWi4?QW ze8W|v5TAGTJ~Wp_`UHkneH~+1_Vi>!ZIIe;fsosd!05M5UaNDWFxt6vw^m;{Dls7Q z9do1g4-Bnx25g(>-i?DO#^@MWS zl2bTx_ROj=Fse<2wNbfLr02>J2*`J?`HIJdwdw%iZHtaU-skcJN)=qTREtTq;8aEf zwze&3TgKkAWCSV%zqG7%e*y5%*A8fg8&6W!MY?9#iOvzJYNal#IFbRsh8l=(xz;mn z3xOe`R;%AuuB^3rzr_|&;?I;hCBPL;JvMTqTe7fLnKXpr5?V5&Zs$o25a$&d@0L|9 z&A_aS%o}bgF24WAW|GHw0DkG!gObq^Oca!)AVN`tZpxa3J%2d?=ud9t9Cga6{i z$F=c)uGbQi1~Wc){!zuyhGEfE+1g_YstQsOJF*d5GXzFqF$D<15ec1l|9cvDQ&bO^B0A!@{q$+5ewaiK* zw(%OPJp)IIoktlVh zoPPGo6BgJ7YQ;aiY!5tzJNo|rkwxMC4;mfp?)zw>Elo1eJ^opfPhhZTidBpp80SOF zF+|!fga?CIYdPfPU%{KKh35O^TQMlvsDet5-ht@zgdFEsaV#lgEZ zC62%FlPJm!uh_Zu>K(AkZ5x}Uwe8^GD1HyRX&or6p^)&D zV|oLY2C~BZUDs@bh`N2#=eBS9?A+gT{HEQE1;v3rP}tW}y#X5??tIS{qs7jFL%!Y< z+5lNfA&jFp-3So!=#-bgz(ynf>Obvccg7T3%BxBXlL09J~``RbuGn<1ll0cj*fFTpX4}OWX9ED zx_ENmFD{{63|!1EH0M@-8;bgouW!c)%p2$^T;^@YLo*nE!L!<94;*k@%~Jnfm-v%K zbys8c(c+iYoUqti{M@a+$KySHss`?W!^nPWk*yoC%j~Sx$Q!R;1DuAR*z96ragt$@ zsMF>6g#&3W;p)lJsmHTb8|eCM$1tRxCz->*H7%z;_DNb@F?F_C>~F3YgUMv++sm9M zGp&BfQtp;*#}$A3cjphXxLI`FySq*Ek&ig>tS>XL37Y7RHGX3W890+zgV-Cpi@i9^ zZ8ouXd#(>fUBtGWesmn3q5Z6Wo(${SJTNC~vma|9LCwSNFnY}0R$V@}xI?0qV$~0| z{ezl0Ws~@Zj0c)C60=A8KzlWFZX!P{Ync0I(2R4hc-Y+RwFTDH V?wZFNGsbVG@t}W@Ad7kL$A3BbgOLCL literal 0 HcmV?d00001 diff --git a/utils/wxPython/demo/bitmaps/tog2.bmp b/utils/wxPython/demo/bitmaps/tog2.bmp index 7d6e7d580e2acc868a74c3943effbd0e8f3e6338..f7f924c1a8253f73c22472492238d62702d5b5da 100644 GIT binary patch literal 238 zcmZ?rea8R+Wk5;;hy{R{ABY(lSb!u0Lj{SetBackgroundColour(_swigarg0)) +static PyObject *_wrap_wxButton_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxButton * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxButton_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetBackgroundColour. Expected _wxButton_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxButton_SetBackgroundColour. Expected _wxColour_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxButton_SetBackgroundColour(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxButton_SetForegroundColour(_swigobj,_swigarg0) (_swigobj->SetForegroundColour(_swigarg0)) +static PyObject *_wrap_wxButton_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxButton * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","colour", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxButton_SetForegroundColour",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetForegroundColour. Expected _wxButton_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxButton_SetForegroundColour. Expected _wxColour_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxButton_SetForegroundColour(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxBitmapButtonTowxButton(void *ptr) { wxBitmapButton *src; wxButton *dest; @@ -7219,6 +7330,8 @@ static PyMethodDef controlscMethods[] = { { "wxBitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS }, { "wxBitmapButton_GetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS }, { "new_wxBitmapButton", (PyCFunction) _wrap_new_wxBitmapButton, METH_VARARGS | METH_KEYWORDS }, + { "wxButton_SetForegroundColour", (PyCFunction) _wrap_wxButton_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { "wxButton_SetBackgroundColour", (PyCFunction) _wrap_wxButton_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxButton_SetDefault", (PyCFunction) _wrap_wxButton_SetDefault, METH_VARARGS | METH_KEYWORDS }, { "new_wxButton", (PyCFunction) _wrap_new_wxButton, METH_VARARGS | METH_KEYWORDS }, { "wxControl_SetLabel", (PyCFunction) _wrap_wxControl_SetLabel, METH_VARARGS | METH_KEYWORDS }, @@ -7395,7 +7508,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxDataFormat","_wxDataFormat",0}, { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_wxGDIImage","_class_wxGDIImage",0}, { "_wxStaticText","_class_wxStaticText",0}, { "_wxFont","_class_wxFont",0}, { "_class_wxPyDropTarget","_wxPyDropTarget",0}, @@ -7569,7 +7681,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxSlider","_wxSlider",0}, { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_class_wxGDIImage","_wxGDIImage",0}, { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, diff --git a/utils/wxPython/src/msw/controls.py b/utils/wxPython/src/msw/controls.py index c38fcaf063..df2650c7aa 100644 --- a/utils/wxPython/src/msw/controls.py +++ b/utils/wxPython/src/msw/controls.py @@ -30,6 +30,7 @@ class wxControl(wxControlPtr): def __init__(self,*_args,**_kwargs): self.this = apply(controlsc.new_wxControl,_args,_kwargs) self.thisown = 1 + wx._StdWindowCallbacks(self) @@ -41,6 +42,12 @@ class wxButtonPtr(wxControlPtr): def SetDefault(self, *_args, **_kwargs): val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs) return val + def SetBackgroundColour(self, *_args, **_kwargs): + val = apply(controlsc.wxButton_SetBackgroundColour,(self,) + _args, _kwargs) + return val + def SetForegroundColour(self, *_args, **_kwargs): + val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxButton(wxButtonPtr): diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp index 74b6409d4f..9b7cb275af 100644 --- a/utils/wxPython/src/msw/controls2.cpp +++ b/utils/wxPython/src/msw/controls2.cpp @@ -6178,7 +6178,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxDataFormat","_wxDataFormat",0}, { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_wxGDIImage","_class_wxGDIImage",0}, { "_wxStaticText","_class_wxStaticText",0}, { "_wxFont","_class_wxFont",0}, { "_class_wxPyDropTarget","_wxPyDropTarget",0}, @@ -6284,7 +6283,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxSlider","_wxSlider",0}, { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_class_wxGDIImage","_wxGDIImage",0}, { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp index 3b2a9e71a1..c3105f1b3b 100644 --- a/utils/wxPython/src/msw/frames.cpp +++ b/utils/wxPython/src/msw/frames.cpp @@ -1004,6 +1004,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, { "_wxPen","_class_wxPen",0}, { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, @@ -1082,17 +1083,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, @@ -1135,6 +1137,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, @@ -1170,7 +1173,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -1239,6 +1241,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxIconizeEvent","_class_wxIconizeEvent",0}, { "_class_wxControl","_wxControl",0}, @@ -1292,6 +1295,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFileDataObject","_class_wxFileDataObject",0}, { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow}, { "_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow}, { "_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow}, diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index feceba62d6..bdaa29bd62 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -1050,296 +1050,6 @@ static PyObject *_wrap_wxNullColour_get() { return pyobj; } -#define wxGDIImage_GetHandle(_swigobj) (_swigobj->GetHandle()) -static PyObject *_wrap_wxGDIImage_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - long _result; - wxGDIImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGDIImage_GetHandle",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_GetHandle. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxGDIImage_GetHandle(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); - return _resultobj; -} - -#define wxGDIImage_SetHandle(_swigobj,_swigarg0) (_swigobj->SetHandle(_swigarg0)) -static PyObject *_wrap_wxGDIImage_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGDIImage * _arg0; - long _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","handle", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxGDIImage_SetHandle",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_SetHandle. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGDIImage_SetHandle(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxGDIImage_Ok(_swigobj) (_swigobj->Ok()) -static PyObject *_wrap_wxGDIImage_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxGDIImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGDIImage_Ok",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_Ok. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxGDIImage_Ok(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxGDIImage_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxGDIImage_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxGDIImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGDIImage_GetWidth",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_GetWidth. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxGDIImage_GetWidth(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxGDIImage_GetHeight(_swigobj) (_swigobj->GetHeight()) -static PyObject *_wrap_wxGDIImage_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxGDIImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGDIImage_GetHeight",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_GetHeight. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxGDIImage_GetHeight(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxGDIImage_GetDepth(_swigobj) (_swigobj->GetDepth()) -static PyObject *_wrap_wxGDIImage_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxGDIImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGDIImage_GetDepth",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_GetDepth. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxGDIImage_GetDepth(_arg0); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - -#define wxGDIImage_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) -static PyObject *_wrap_wxGDIImage_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGDIImage * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","w", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGDIImage_SetWidth",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_SetWidth. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGDIImage_SetWidth(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxGDIImage_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) -static PyObject *_wrap_wxGDIImage_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGDIImage * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","h", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGDIImage_SetHeight",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_SetHeight. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGDIImage_SetHeight(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxGDIImage_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) -static PyObject *_wrap_wxGDIImage_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGDIImage * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","d", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGDIImage_SetDepth",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_SetDepth. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGDIImage_SetDepth(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxGDIImage_SetSize(_swigobj,_swigarg0) (_swigobj->SetSize(_swigarg0)) -static PyObject *_wrap_wxGDIImage_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGDIImage * _arg0; - wxSize * _arg1; - PyObject * _argo0 = 0; - wxSize temp; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","size", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGDIImage_SetSize",_kwnames,&_argo0,&_obj1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGDIImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGDIImage_SetSize. Expected _wxGDIImage_p."); - return NULL; - } - } -{ - _arg1 = &temp; - if (! wxSize_helper(_obj1, &_arg1)) - return NULL; -} -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGDIImage_SetSize(_arg0,*_arg1); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -static void *SwigwxBitmapTowxGDIImage(void *ptr) { - wxBitmap *src; - wxGDIImage *dest; - src = (wxBitmap *) ptr; - dest = (wxGDIImage *) src; - return (void *) dest; -} - #define new_wxBitmap(_swigarg0,_swigarg1) (new wxBitmap(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1637,109 +1347,190 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args, PyObj return _resultobj; } -#define new_wxMask(_swigarg0) (new wxMask(_swigarg0)) -static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBitmap_GetHandle(_swigobj) (_swigobj->GetHandle()) +static PyObject *_wrap_wxBitmap_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxMask * _result; + long _result; wxBitmap * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "bitmap", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxMask",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetHandle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMask. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetHandle. Expected _wxBitmap_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxMask *)new_wxMask(*_arg0); + _result = (long )wxBitmap_GetHandle(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} _resultobj = Py_BuildValue("l",_result); return _resultobj; } -static void *SwigwxIconTowxGDIImage(void *ptr) { - wxIcon *src; - wxGDIImage *dest; - src = (wxIcon *) ptr; - dest = (wxGDIImage *) src; - return (void *) dest; -} - -#define new_wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBitmap_SetHandle(_swigobj,_swigarg0) (_swigobj->SetHandle(_swigarg0)) +static PyObject *_wrap_wxBitmap_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxIcon * _result; - wxString * _arg0; + wxBitmap * _arg0; long _arg1; - int _arg2 = (int ) -1; - int _arg3 = (int ) -1; - PyObject * _obj0 = 0; - char *_kwnames[] = { "name","flags","desiredWidth","desiredHeight", NULL }; - char _ptemp[128]; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","handle", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxIcon",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxBitmap_SetHandle",_kwnames,&_argo0,&_arg1)) return NULL; -{ - if (!PyString_Check(_obj0)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetHandle. Expected _wxBitmap_p."); return NULL; + } } - _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0)); +{ + wxPy_BEGIN_ALLOW_THREADS; + wxBitmap_SetHandle(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; } + +#define wxBitmap_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxBitmap_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxBitmap * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_Ok",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_Ok. Expected _wxBitmap_p."); + return NULL; + } + } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxIcon *)new_wxIcon(*_arg0,_arg1,_arg2,_arg3); + _result = (bool )wxBitmap_Ok(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxBitmap_GetWidth(_swigobj) (_swigobj->GetWidth()) +static PyObject *_wrap_wxBitmap_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxBitmap * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetWidth. Expected _wxBitmap_p."); + return NULL; + } } { - if (_obj0) - delete _arg0; + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxBitmap_GetWidth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; } + +#define wxBitmap_GetHeight(_swigobj) (_swigobj->GetHeight()) +static PyObject *_wrap_wxBitmap_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxBitmap * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetHeight. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxBitmap_GetHeight(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define delete_wxIcon(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBitmap_GetDepth(_swigobj) (_swigobj->GetDepth()) +static PyObject *_wrap_wxBitmap_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxIcon * _arg0; + int _result; + wxBitmap * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxIcon",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmap_GetDepth",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIcon. Expected _wxIcon_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_GetDepth. Expected _wxBitmap_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - delete_wxIcon(_arg0); + _result = (int )wxBitmap_GetDepth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxBitmap_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) +static PyObject *_wrap_wxBitmap_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetWidth. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxBitmap_SetWidth(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -1747,69 +1538,145 @@ static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args, PyObject *k return _resultobj; } -#define wxIcon_LoadFile(_swigobj,_swigarg0,_swigarg1) (_swigobj->LoadFile(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxBitmap_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) +static PyObject *_wrap_wxBitmap_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxIcon * _arg0; - wxString * _arg1; - long _arg2; + wxBitmap * _arg0; + int _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","name","flags", NULL }; + char *_kwnames[] = { "self","h", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOl:wxIcon_LoadFile",_kwnames,&_argo0,&_obj1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetHeight",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_LoadFile. Expected _wxIcon_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetHeight. Expected _wxBitmap_p."); return NULL; } } { - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + wxPy_BEGIN_ALLOW_THREADS; + wxBitmap_SetHeight(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBitmap_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) +static PyObject *_wrap_wxBitmap_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","d", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxBitmap_SetDepth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetDepth. Expected _wxBitmap_p."); return NULL; + } } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); -} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxIcon_LoadFile(_arg0,*_arg1,_arg2); + wxBitmap_SetDepth(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBitmap_SetSize(_swigobj,_swigarg0) (_swigobj->SetSize(_swigarg0)) +static PyObject *_wrap_wxBitmap_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmap_SetSize",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmap_SetSize. Expected _wxBitmap_p."); + return NULL; + } + } { - if (_obj1) - delete _arg1; + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxBitmap_SetSize(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -static void *SwigwxCursorTowxGDIImage(void *ptr) { - wxCursor *src; - wxGDIImage *dest; - src = (wxCursor *) ptr; - dest = (wxGDIImage *) src; - return (void *) dest; +#define new_wxMask(_swigarg0) (new wxMask(_swigarg0)) +static PyObject *_wrap_new_wxMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMask * _result; + wxBitmap * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "bitmap", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxMask",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMask. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxMask *)new_wxMask(*_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxMask_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; } -#define new_wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxIcon(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxCursor * _result; + wxIcon * _result; wxString * _arg0; long _arg1; - int _arg2 = (int ) 0; - int _arg3 = (int ) 0; + int _arg2 = (int ) -1; + int _arg3 = (int ) -1; PyObject * _obj0 = 0; - char *_kwnames[] = { "cursorName","flags","hotSpotX","hotSpotY", NULL }; + char *_kwnames[] = { "name","flags","desiredWidth","desiredHeight", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxCursor",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxIcon",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) return NULL; { if (!PyString_Check(_obj0)) { @@ -1820,11 +1687,11 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kw } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxCursor *)new_wxCursor(*_arg0,_arg1,_arg2,_arg3); + _result = (wxIcon *)new_wxIcon(*_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -1837,26 +1704,699 @@ static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kw return _resultobj; } -#define delete_wxCursor(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { +#define delete_wxIcon(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxCursor * _arg0; + wxIcon * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxCursor",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxIcon",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxCursor. Expected _wxCursor_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIcon. Expected _wxIcon_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - delete_wxCursor(_arg0); + delete_wxIcon(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIcon_LoadFile(_swigobj,_swigarg0,_swigarg1) (_swigobj->LoadFile(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxIcon_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxIcon * _arg0; + wxString * _arg1; + long _arg2; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","name","flags", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOl:wxIcon_LoadFile",_kwnames,&_argo0,&_obj1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_LoadFile. Expected _wxIcon_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxIcon_LoadFile(_arg0,*_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxIcon_GetHandle(_swigobj) (_swigobj->GetHandle()) +static PyObject *_wrap_wxIcon_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxIcon * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetHandle",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetHandle. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (long )wxIcon_GetHandle(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxIcon_SetHandle(_swigobj,_swigarg0) (_swigobj->SetHandle(_swigarg0)) +static PyObject *_wrap_wxIcon_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","handle", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxIcon_SetHandle",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetHandle. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxIcon_SetHandle(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIcon_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxIcon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxIcon * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_Ok",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_Ok. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxIcon_Ok(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxIcon_GetWidth(_swigobj) (_swigobj->GetWidth()) +static PyObject *_wrap_wxIcon_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxIcon * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetWidth. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxIcon_GetWidth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxIcon_GetHeight(_swigobj) (_swigobj->GetHeight()) +static PyObject *_wrap_wxIcon_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxIcon * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetHeight. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxIcon_GetHeight(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxIcon_GetDepth(_swigobj) (_swigobj->GetDepth()) +static PyObject *_wrap_wxIcon_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxIcon * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIcon_GetDepth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_GetDepth. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxIcon_GetDepth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxIcon_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) +static PyObject *_wrap_wxIcon_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetWidth. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxIcon_SetWidth(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIcon_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) +static PyObject *_wrap_wxIcon_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","h", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetHeight",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetHeight. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxIcon_SetHeight(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIcon_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) +static PyObject *_wrap_wxIcon_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","d", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIcon_SetDepth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetDepth. Expected _wxIcon_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxIcon_SetDepth(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxIcon_SetSize(_swigobj,_swigarg0) (_swigobj->SetSize(_swigarg0)) +static PyObject *_wrap_wxIcon_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxIcon * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxIcon_SetSize",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIcon_SetSize. Expected _wxIcon_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxIcon_SetSize(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define new_wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxCursor(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _result; + wxString * _arg0; + long _arg1; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "cursorName","flags","hotSpotX","hotSpotY", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:new_wxCursor",_kwnames,&_obj0,&_arg1,&_arg2,&_arg3)) + return NULL; +{ + if (!PyString_Check(_obj0)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxCursor *)new_wxCursor(*_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxCursor_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define delete_wxCursor(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxCursor(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxCursor",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxCursor. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + delete_wxCursor(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCursor_GetHandle(_swigobj) (_swigobj->GetHandle()) +static PyObject *_wrap_wxCursor_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_GetHandle",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_GetHandle. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (long )wxCursor_GetHandle(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxCursor_SetHandle(_swigobj,_swigarg0) (_swigobj->SetHandle(_swigarg0)) +static PyObject *_wrap_wxCursor_SetHandle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","handle", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxCursor_SetHandle",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_SetHandle. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxCursor_SetHandle(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCursor_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxCursor_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_Ok",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_Ok. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxCursor_Ok(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCursor_GetWidth(_swigobj) (_swigobj->GetWidth()) +static PyObject *_wrap_wxCursor_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_GetWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_GetWidth. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxCursor_GetWidth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCursor_GetHeight(_swigobj) (_swigobj->GetHeight()) +static PyObject *_wrap_wxCursor_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_GetHeight",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_GetHeight. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxCursor_GetHeight(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCursor_GetDepth(_swigobj) (_swigobj->GetDepth()) +static PyObject *_wrap_wxCursor_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxCursor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCursor_GetDepth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_GetDepth. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxCursor_GetDepth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCursor_SetWidth(_swigobj,_swigarg0) (_swigobj->SetWidth(_swigarg0)) +static PyObject *_wrap_wxCursor_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCursor_SetWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_SetWidth. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxCursor_SetWidth(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCursor_SetHeight(_swigobj,_swigarg0) (_swigobj->SetHeight(_swigarg0)) +static PyObject *_wrap_wxCursor_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","h", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCursor_SetHeight",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_SetHeight. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxCursor_SetHeight(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCursor_SetDepth(_swigobj,_swigarg0) (_swigobj->SetDepth(_swigarg0)) +static PyObject *_wrap_wxCursor_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","d", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCursor_SetDepth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_SetDepth. Expected _wxCursor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxCursor_SetDepth(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCursor_SetSize(_swigobj,_swigarg0) (_swigobj->SetSize(_swigarg0)) +static PyObject *_wrap_wxCursor_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxCursor * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxCursor_SetSize",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCursor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCursor_SetSize. Expected _wxCursor_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxCursor_SetSize(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -7108,12 +7648,42 @@ static PyMethodDef gdicMethods[] = { { "wxFont_GetFaceName", (PyCFunction) _wrap_wxFont_GetFaceName, METH_VARARGS | METH_KEYWORDS }, { "wxFont_Ok", (PyCFunction) _wrap_wxFont_Ok, METH_VARARGS | METH_KEYWORDS }, { "new_wxFont", (PyCFunction) _wrap_new_wxFont, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_SetSize", (PyCFunction) _wrap_wxCursor_SetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_SetDepth", (PyCFunction) _wrap_wxCursor_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_SetHeight", (PyCFunction) _wrap_wxCursor_SetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_SetWidth", (PyCFunction) _wrap_wxCursor_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_GetDepth", (PyCFunction) _wrap_wxCursor_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_GetHeight", (PyCFunction) _wrap_wxCursor_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_GetWidth", (PyCFunction) _wrap_wxCursor_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_Ok", (PyCFunction) _wrap_wxCursor_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_SetHandle", (PyCFunction) _wrap_wxCursor_SetHandle, METH_VARARGS | METH_KEYWORDS }, + { "wxCursor_GetHandle", (PyCFunction) _wrap_wxCursor_GetHandle, METH_VARARGS | METH_KEYWORDS }, { "delete_wxCursor", (PyCFunction) _wrap_delete_wxCursor, METH_VARARGS | METH_KEYWORDS }, { "new_wxCursor", (PyCFunction) _wrap_new_wxCursor, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetSize", (PyCFunction) _wrap_wxIcon_SetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetDepth", (PyCFunction) _wrap_wxIcon_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetHeight", (PyCFunction) _wrap_wxIcon_SetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetWidth", (PyCFunction) _wrap_wxIcon_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetDepth", (PyCFunction) _wrap_wxIcon_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetHeight", (PyCFunction) _wrap_wxIcon_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetWidth", (PyCFunction) _wrap_wxIcon_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_Ok", (PyCFunction) _wrap_wxIcon_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_SetHandle", (PyCFunction) _wrap_wxIcon_SetHandle, METH_VARARGS | METH_KEYWORDS }, + { "wxIcon_GetHandle", (PyCFunction) _wrap_wxIcon_GetHandle, METH_VARARGS | METH_KEYWORDS }, { "wxIcon_LoadFile", (PyCFunction) _wrap_wxIcon_LoadFile, METH_VARARGS | METH_KEYWORDS }, { "delete_wxIcon", (PyCFunction) _wrap_delete_wxIcon, METH_VARARGS | METH_KEYWORDS }, { "new_wxIcon", (PyCFunction) _wrap_new_wxIcon, METH_VARARGS | METH_KEYWORDS }, { "new_wxMask", (PyCFunction) _wrap_new_wxMask, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetSize", (PyCFunction) _wrap_wxBitmap_SetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetDepth", (PyCFunction) _wrap_wxBitmap_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetHeight", (PyCFunction) _wrap_wxBitmap_SetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetWidth", (PyCFunction) _wrap_wxBitmap_SetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetDepth", (PyCFunction) _wrap_wxBitmap_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetHeight", (PyCFunction) _wrap_wxBitmap_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetWidth", (PyCFunction) _wrap_wxBitmap_GetWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_Ok", (PyCFunction) _wrap_wxBitmap_Ok, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_SetHandle", (PyCFunction) _wrap_wxBitmap_SetHandle, METH_VARARGS | METH_KEYWORDS }, + { "wxBitmap_GetHandle", (PyCFunction) _wrap_wxBitmap_GetHandle, METH_VARARGS | METH_KEYWORDS }, { "wxBitmap_SetPalette", (PyCFunction) _wrap_wxBitmap_SetPalette, METH_VARARGS | METH_KEYWORDS }, { "wxBitmap_SetMask", (PyCFunction) _wrap_wxBitmap_SetMask, METH_VARARGS | METH_KEYWORDS }, { "wxBitmap_SaveFile", (PyCFunction) _wrap_wxBitmap_SaveFile, METH_VARARGS | METH_KEYWORDS }, @@ -7122,16 +7692,6 @@ static PyMethodDef gdicMethods[] = { { "wxBitmap_GetPalette", (PyCFunction) _wrap_wxBitmap_GetPalette, METH_VARARGS | METH_KEYWORDS }, { "delete_wxBitmap", (PyCFunction) _wrap_delete_wxBitmap, METH_VARARGS | METH_KEYWORDS }, { "new_wxBitmap", (PyCFunction) _wrap_new_wxBitmap, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_SetSize", (PyCFunction) _wrap_wxGDIImage_SetSize, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_SetDepth", (PyCFunction) _wrap_wxGDIImage_SetDepth, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_SetHeight", (PyCFunction) _wrap_wxGDIImage_SetHeight, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_SetWidth", (PyCFunction) _wrap_wxGDIImage_SetWidth, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_GetDepth", (PyCFunction) _wrap_wxGDIImage_GetDepth, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_GetHeight", (PyCFunction) _wrap_wxGDIImage_GetHeight, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_GetWidth", (PyCFunction) _wrap_wxGDIImage_GetWidth, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_Ok", (PyCFunction) _wrap_wxGDIImage_Ok, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_SetHandle", (PyCFunction) _wrap_wxGDIImage_SetHandle, METH_VARARGS | METH_KEYWORDS }, - { "wxGDIImage_GetHandle", (PyCFunction) _wrap_wxGDIImage_GetHandle, METH_VARARGS | METH_KEYWORDS }, { "wxMemoryDCFromDC", (PyCFunction) _wrap_wxMemoryDCFromDC, METH_VARARGS | METH_KEYWORDS }, { "wxNamedColour", (PyCFunction) _wrap_wxNamedColour, METH_VARARGS | METH_KEYWORDS }, { "wxFont_SetDefaultEncoding", (PyCFunction) _wrap_wxFont_SetDefaultEncoding, METH_VARARGS | METH_KEYWORDS }, @@ -7214,13 +7774,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_class_wxRegion","_wxRegion",0}, - { "_wxGDIImage","_class_wxCursor",SwigwxCursorTowxGDIImage}, - { "_wxGDIImage","_wxCursor",SwigwxCursorTowxGDIImage}, - { "_wxGDIImage","_class_wxIcon",SwigwxIconTowxGDIImage}, - { "_wxGDIImage","_wxIcon",SwigwxIconTowxGDIImage}, - { "_wxGDIImage","_class_wxBitmap",SwigwxBitmapTowxGDIImage}, - { "_wxGDIImage","_wxBitmap",SwigwxBitmapTowxGDIImage}, - { "_wxGDIImage","_class_wxGDIImage",0}, { "_wxFont","_class_wxFont",0}, { "_unsigned_long","_wxDash",0}, { "_unsigned_long","_long",0}, @@ -7282,13 +7835,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, { "_class_wxImageList","_wxImageList",0}, - { "_class_wxGDIImage","_class_wxCursor",SwigwxCursorTowxGDIImage}, - { "_class_wxGDIImage","_wxCursor",SwigwxCursorTowxGDIImage}, - { "_class_wxGDIImage","_class_wxIcon",SwigwxIconTowxGDIImage}, - { "_class_wxGDIImage","_wxIcon",SwigwxIconTowxGDIImage}, - { "_class_wxGDIImage","_class_wxBitmap",SwigwxBitmapTowxGDIImage}, - { "_class_wxGDIImage","_wxBitmap",SwigwxBitmapTowxGDIImage}, - { "_class_wxGDIImage","_wxGDIImage",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_size_t",0}, diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index 34b2e025ad..b2c401560c 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -2,50 +2,7 @@ import gdic from misc import * -class wxGDIImagePtr : - def __init__(self,this): - self.this = this - self.thisown = 0 - def GetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_GetHandle,(self,) + _args, _kwargs) - return val - def SetHandle(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_SetHandle,(self,) + _args, _kwargs) - return val - def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_Ok,(self,) + _args, _kwargs) - return val - def GetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_GetWidth,(self,) + _args, _kwargs) - return val - def GetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_GetHeight,(self,) + _args, _kwargs) - return val - def GetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_GetDepth,(self,) + _args, _kwargs) - return val - def SetWidth(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_SetWidth,(self,) + _args, _kwargs) - return val - def SetHeight(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_SetHeight,(self,) + _args, _kwargs) - return val - def SetDepth(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_SetDepth,(self,) + _args, _kwargs) - return val - def SetSize(self, *_args, **_kwargs): - val = apply(gdic.wxGDIImage_SetSize,(self,) + _args, _kwargs) - return val - def __repr__(self): - return "" % (self.this,) -class wxGDIImage(wxGDIImagePtr): - def __init__(self,this): - self.this = this - - - - -class wxBitmapPtr(wxGDIImagePtr): +class wxBitmapPtr : def __init__(self,this): self.this = this self.thisown = 0 @@ -72,6 +29,36 @@ class wxBitmapPtr(wxGDIImagePtr): def SetPalette(self, *_args, **_kwargs): val = apply(gdic.wxBitmap_SetPalette,(self,) + _args, _kwargs) return val + def GetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_GetHandle,(self,) + _args, _kwargs) + return val + def SetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_SetHandle,(self,) + _args, _kwargs) + return val + def Ok(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs) + return val + def GetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs) + return val + def GetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs) + return val + def GetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs) + return val + def SetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs) + return val + def SetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs) + return val + def SetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs) + return val + def SetSize(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_SetSize,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxBitmap(wxBitmapPtr): @@ -96,7 +83,7 @@ class wxMask(wxMaskPtr): -class wxIconPtr(wxGDIImagePtr): +class wxIconPtr : def __init__(self,this): self.this = this self.thisown = 0 @@ -106,6 +93,36 @@ class wxIconPtr(wxGDIImagePtr): def LoadFile(self, *_args, **_kwargs): val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs) return val + def GetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_GetHandle,(self,) + _args, _kwargs) + return val + def SetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_SetHandle,(self,) + _args, _kwargs) + return val + def Ok(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs) + return val + def GetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs) + return val + def GetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs) + return val + def GetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs) + return val + def SetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs) + return val + def SetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs) + return val + def SetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs) + return val + def SetSize(self, *_args, **_kwargs): + val = apply(gdic.wxIcon_SetSize,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxIcon(wxIconPtr): @@ -116,13 +133,43 @@ class wxIcon(wxIconPtr): -class wxCursorPtr(wxGDIImagePtr): +class wxCursorPtr : def __init__(self,this): self.this = this self.thisown = 0 def __del__(self,gdic=gdic): if self.thisown == 1 : gdic.delete_wxCursor(self) + def GetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_GetHandle,(self,) + _args, _kwargs) + return val + def SetHandle(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_SetHandle,(self,) + _args, _kwargs) + return val + def Ok(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) + return val + def GetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_GetWidth,(self,) + _args, _kwargs) + return val + def GetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_GetHeight,(self,) + _args, _kwargs) + return val + def GetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_GetDepth,(self,) + _args, _kwargs) + return val + def SetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_SetWidth,(self,) + _args, _kwargs) + return val + def SetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_SetHeight,(self,) + _args, _kwargs) + return val + def SetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_SetDepth,(self,) + _args, _kwargs) + return val + def SetSize(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_SetSize,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxCursor(wxCursorPtr): @@ -231,6 +278,9 @@ class wxColourPtr : return val def __repr__(self): return "" % (self.this,) + asTuple = Get + def __str__(self): return str(self.asTuple()) + def __repr__(self): return str(self.asTuple()) class wxColour(wxColourPtr): def __init__(self,*_args,**_kwargs): self.this = apply(gdic.new_wxColour,_args,_kwargs) diff --git a/utils/wxPython/src/msw/image.cpp b/utils/wxPython/src/msw/image.cpp index c20acf2686..bef0b178fc 100644 --- a/utils/wxPython/src/msw/image.cpp +++ b/utils/wxPython/src/msw/image.cpp @@ -772,6 +772,39 @@ static PyObject *_wrap_new_wxPCXHandler(PyObject *self, PyObject *args, PyObject return _resultobj; } +static void *SwigwxTIFFHandlerTowxImageHandler(void *ptr) { + wxTIFFHandler *src; + wxImageHandler *dest; + src = (wxTIFFHandler *) ptr; + dest = (wxImageHandler *) src; + return (void *) dest; +} + +#define new_wxTIFFHandler() (new wxTIFFHandler()) +static PyObject *_wrap_new_wxTIFFHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTIFFHandler * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxTIFFHandler",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxTIFFHandler *)new_wxTIFFHandler(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTIFFHandler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + #define new_wxImage(_swigarg0,_swigarg1) (new wxImage(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1681,6 +1714,7 @@ static PyMethodDef imagecMethods[] = { { "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS }, { "delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS }, { "new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS }, + { "new_wxTIFFHandler", (PyCFunction) _wrap_new_wxTIFFHandler, METH_VARARGS | METH_KEYWORDS }, { "new_wxPCXHandler", (PyCFunction) _wrap_new_wxPCXHandler, METH_VARARGS | METH_KEYWORDS }, { "new_wxPNMHandler", (PyCFunction) _wrap_new_wxPNMHandler, METH_VARARGS | METH_KEYWORDS }, { "new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS }, @@ -1727,6 +1761,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxGIFHandler","_class_wxGIFHandler",0}, { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, + { "_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, + { "_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, { "_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, { "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, { "_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, @@ -1748,6 +1784,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, { "_wxImageList","_class_wxImageList",0}, + { "_class_wxTIFFHandler","_wxTIFFHandler",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_wxDC","_class_wxDC",0}, { "_class_wxBMPHandler","_wxBMPHandler",0}, @@ -1818,6 +1855,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindowDC","_wxWindowDC",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, + { "_class_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, + { "_class_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, { "_class_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, { "_class_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, { "_class_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, @@ -1882,6 +1921,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_wxPrintQuality",0}, { "_wxRegion","_class_wxRegion",0}, { "_class_wxPCXHandler","_wxPCXHandler",0}, + { "_wxTIFFHandler","_class_wxTIFFHandler",0}, { "_class_wxBusyInfo","_wxBusyInfo",0}, { "_class_wxClientDC","_wxClientDC",0}, { "_class_wxSize","_wxSize",0}, diff --git a/utils/wxPython/src/msw/image.py b/utils/wxPython/src/msw/image.py index 1f0924638d..6e5bbef780 100644 --- a/utils/wxPython/src/msw/image.py +++ b/utils/wxPython/src/msw/image.py @@ -125,6 +125,20 @@ class wxPCXHandler(wxPCXHandlerPtr): +class wxTIFFHandlerPtr(wxImageHandlerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" % (self.this,) +class wxTIFFHandler(wxTIFFHandlerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(imagec.new_wxTIFFHandler,_args,_kwargs) + self.thisown = 1 + + + + class wxImagePtr : def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp index cfe718a23f..b3058c41a8 100644 --- a/utils/wxPython/src/msw/mdi.cpp +++ b/utils/wxPython/src/msw/mdi.cpp @@ -754,6 +754,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, { "_wxPen","_class_wxPen",0}, { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, @@ -832,18 +833,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, @@ -887,6 +889,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, @@ -926,7 +929,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -998,6 +1000,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxIconizeEvent","_class_wxIconizeEvent",0}, { "_class_wxControl","_wxControl",0}, @@ -1054,6 +1057,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, { "_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow}, { "_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow}, diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py index 4df6a39760..95e4293606 100644 --- a/utils/wxPython/src/msw/misc.py +++ b/utils/wxPython/src/msw/misc.py @@ -239,6 +239,44 @@ class wxRectPtr : return "" % (self.this,) def __str__(self): return str(self.asTuple()) def __repr__(self): return str(self.asTuple()) + + # override the __getattr__ made by SWIG + def __getattr__(self, name): + d = { + 'x' : miscc.wxRect_x_get, + 'y' : miscc.wxRect_y_get, + 'width' : miscc.wxRect_width_get, + 'height' : miscc.wxRect_height_get, + 'top' : miscc.wxRect_GetTop, + 'bottom' : miscc.wxRect_GetBottom, + 'left' : miscc.wxRect_GetLeft, + 'right' : miscc.wxRect_GetRight, + } + try: + func = d[name] + except KeyError: + raise AttributeError,name + return func(self) + + # and also the __setattr__ + def __setattr__(self, name, value): + d = { + 'x' : miscc.wxRect_x_set, + 'y' : miscc.wxRect_y_set, + 'width' : miscc.wxRect_width_set, + 'height' : miscc.wxRect_height_set, + 'top' : miscc.wxRect_SetTop, + 'bottom' : miscc.wxRect_SetBottom, + 'left' : miscc.wxRect_SetLeft, + 'right' : miscc.wxRect_SetRight, + } + try: + func = d[name] + except KeyError: + self.__dict__[name] = value + return + func(self, value) + class wxRect(wxRectPtr): def __init__(self,*_args,**_kwargs): self.this = apply(miscc.new_wxRect,_args,_kwargs) diff --git a/utils/wxPython/src/msw/printfw.cpp b/utils/wxPython/src/msw/printfw.cpp index d2562550ba..65d2ebe346 100644 --- a/utils/wxPython/src/msw/printfw.cpp +++ b/utils/wxPython/src/msw/printfw.cpp @@ -4376,6 +4376,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, { "_class_wxColourData","_wxColourData",0}, { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0}, @@ -4475,7 +4476,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_wxColourDialog","_class_wxColourDialog",0}, { "_wxPrintData","_class_wxPrintData",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, @@ -4486,10 +4486,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, @@ -4540,6 +4542,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, @@ -4581,7 +4584,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -4656,6 +4658,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxIconizeEvent","_class_wxIconizeEvent",0}, { "_class_wxControl","_wxControl",0}, @@ -4720,6 +4723,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFileDataObject","_class_wxFileDataObject",0}, { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_class_wxFontDialog","_wxFontDialog",0}, { "_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, { "_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, diff --git a/utils/wxPython/src/msw/sizers.cpp b/utils/wxPython/src/msw/sizers.cpp index dc409906f6..4e744fc64d 100644 --- a/utils/wxPython/src/msw/sizers.cpp +++ b/utils/wxPython/src/msw/sizers.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { static char* wxStringErrorMsg = "string type is required for parameter"; -class wxPyUserData : public wxObject { -public: - wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); } - ~wxPyUserData() { - bool doSave = wxPyRestoreThread(); - Py_DECREF(m_obj); - wxPySaveThread(doSave); - } - PyObject* m_obj; -}; - class wxPySizer : public wxSizer { DECLARE_DYNAMIC_CLASS(wxPySizer); public: @@ -464,6 +453,119 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxSizerItem_SetInitSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetInitSize(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSizerItem_SetInitSize",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetInitSize. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetInitSize(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizerItem_SetOption(_swigobj,_swigarg0) (_swigobj->SetOption(_swigarg0)) +static PyObject *_wrap_wxSizerItem_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","option", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetOption",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetOption. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetOption(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizerItem_SetFlag(_swigobj,_swigarg0) (_swigobj->SetFlag(_swigarg0)) +static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flag", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetFlag",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetFlag. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetFlag(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizerItem_SetBorder(_swigobj,_swigarg0) (_swigobj->SetBorder(_swigarg0)) +static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","border", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetBorder",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetBorder. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetBorder(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyObject * wxSizerItem_GetUserData(wxSizerItem *self) { wxPyUserData* data = (wxPyUserData*)self->GetUserData(); if (data) { @@ -1395,6 +1497,10 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetOption", (PyCFunction) _wrap_wxSizerItem_SetOption, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetInitSize", (PyCFunction) _wrap_wxSizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetBorder", (PyCFunction) _wrap_wxSizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetFlag", (PyCFunction) _wrap_wxSizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetOption", (PyCFunction) _wrap_wxSizerItem_GetOption, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/msw/sizers.py b/utils/wxPython/src/msw/sizers.py index 1a88027307..6f809036ad 100644 --- a/utils/wxPython/src/msw/sizers.py +++ b/utils/wxPython/src/msw/sizers.py @@ -55,6 +55,18 @@ class wxSizerItemPtr : def GetBorder(self, *_args, **_kwargs): val = apply(sizersc.wxSizerItem_GetBorder,(self,) + _args, _kwargs) return val + def SetInitSize(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetInitSize,(self,) + _args, _kwargs) + return val + def SetOption(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetOption,(self,) + _args, _kwargs) + return val + def SetFlag(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetFlag,(self,) + _args, _kwargs) + return val + def SetBorder(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetBorder,(self,) + _args, _kwargs) + return val def GetUserData(self, *_args, **_kwargs): val = apply(sizersc.wxSizerItem_GetUserData,(self,) + _args, _kwargs) return val diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp index 04df51a9b3..fc7b1365ff 100644 --- a/utils/wxPython/src/msw/stattool.cpp +++ b/utils/wxPython/src/msw/stattool.cpp @@ -496,80 +496,26 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg return _resultobj; } -#define new_wxToolBarTool() (new wxToolBarTool()) -static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) { +static void wxToolBarToolBase_Destroy(wxToolBarToolBase *self) { delete self; } +static PyObject *_wrap_wxToolBarToolBase_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBarTool * _result; - char *_kwnames[] = { NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxToolBarTool",_kwnames)) - return NULL; -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (wxToolBarTool *)new_wxToolBarTool(); - - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } - return _resultobj; -} - -#define delete_wxToolBarTool(_swigobj) (delete _swigobj) -static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxToolBarTool",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxToolBarTool. Expected _wxToolBarTool_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - delete_wxToolBarTool(_arg0); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxToolBarTool_SetSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBarTool * _arg0; - long _arg1; - long _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","w","h", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxToolBarTool_SetSize",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_Destroy",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_SetSize. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_Destroy. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBarTool_SetSize(_arg0,_arg1,_arg2); + wxToolBarToolBase_Destroy(_arg0); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -577,86 +523,93 @@ static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxToolBarTool_GetWidth(_swigobj) (_swigobj->GetWidth()) -static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetId(_swigobj) (_swigobj->GetId()) +static PyObject *_wrap_wxToolBarToolBase_GetId(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + int _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_GetWidth",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetId",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetWidth. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetId. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_GetWidth(_arg0); + _result = (int )wxToolBarToolBase_GetId(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_GetHeight(_swigobj) (_swigobj->GetHeight()) -static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetControl(_swigobj) (_swigobj->GetControl()) +static PyObject *_wrap_wxToolBarToolBase_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + wxControl * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_GetHeight",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetControl",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetHeight. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetControl. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_GetHeight(_arg0); + _result = (wxControl *)wxToolBarToolBase_GetControl(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxControl_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_GetControl(_swigobj) (_swigobj->GetControl()) -static PyObject *_wrap_wxToolBarTool_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetToolBar(_swigobj) (_swigobj->GetToolBar()) +static PyObject *_wrap_wxToolBarToolBase_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxControl * _result; - wxToolBarTool * _arg0; + wxToolBarBase * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_GetControl",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetToolBar",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_GetControl. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetToolBar. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxControl *)wxToolBarTool_GetControl(_arg0); + _result = (wxToolBarBase *)wxToolBarToolBase_GetToolBar(_arg0); wxPy_END_ALLOW_THREADS; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxControl_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarBase_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -665,1065 +618,1290 @@ static PyObject *_wrap_wxToolBarTool_GetControl(PyObject *self, PyObject *args, return _resultobj; } -#define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_IsButton(_swigobj) (_swigobj->IsButton()) +static PyObject *_wrap_wxToolBarToolBase_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxToolBarTool * _arg0; - int _arg1; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_toolStyle", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toolStyle_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_IsButton",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_IsButton. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBarTool_m_toolStyle_set(_arg0,_arg1); + _result = (int )wxToolBarToolBase_IsButton(_arg0); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle) -static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_IsControl(_swigobj) (_swigobj->IsControl()) +static PyObject *_wrap_wxToolBarToolBase_IsControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toolStyle_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_IsControl",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_IsControl. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBarTool_m_toolStyle_get(_arg0); + _result = (int )wxToolBarToolBase_IsControl(_arg0); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxObject * _result; - wxToolBarTool * _arg0; - wxObject * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","m_clientData", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_clientData_set",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxObject_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } - return _resultobj; -} - -#define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData) -static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_IsSeparator(_swigobj) (_swigobj->IsSeparator()) +static PyObject *_wrap_wxToolBarToolBase_IsSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxObject * _result; - wxToolBarTool * _arg0; + int _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_clientData_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_IsSeparator",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_IsSeparator. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0); + _result = (int )wxToolBarToolBase_IsSeparator(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetStyle(_swigobj) (_swigobj->GetStyle()) +static PyObject *_wrap_wxToolBarToolBase_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxToolBarTool * _arg0; - int _arg1; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_index", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_index_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetStyle",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetStyle. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBarTool_m_index_set(_arg0,_arg1); + _result = (int )wxToolBarToolBase_GetStyle(_arg0); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index) -static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_IsEnabled(_swigobj) (_swigobj->IsEnabled()) +static PyObject *_wrap_wxToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxToolBarTool * _arg0; + bool _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_index_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_IsEnabled",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_IsEnabled. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBarTool_m_index_get(_arg0); + _result = (bool )wxToolBarToolBase_IsEnabled(_arg0); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_IsToggled(_swigobj) (_swigobj->IsToggled()) +static PyObject *_wrap_wxToolBarToolBase_IsToggled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; - long _arg1; + bool _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_x", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_x_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_IsToggled",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_IsToggled. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_x_set(_arg0,_arg1); + _result = (bool )wxToolBarToolBase_IsToggled(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_x_get(_swigobj) ((long ) _swigobj->m_x) -static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_CanBeToggled(_swigobj) (_swigobj->CanBeToggled()) +static PyObject *_wrap_wxToolBarToolBase_CanBeToggled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + bool _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_x_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_CanBeToggled",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_CanBeToggled. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_x_get(_arg0); + _result = (bool )wxToolBarToolBase_CanBeToggled(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetBitmap1(_swigobj) (_swigobj->GetBitmap1()) +static PyObject *_wrap_wxToolBarToolBase_GetBitmap1(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; - long _arg1; + wxBitmap * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_y", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_y_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetBitmap1",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetBitmap1. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_y_set(_arg0,_arg1); + const wxBitmap & _result_ref = wxToolBarToolBase_GetBitmap1(_arg0); + _result = (wxBitmap *) &_result_ref; wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_m_y_get(_swigobj) ((long ) _swigobj->m_y) -static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetBitmap2(_swigobj) (_swigobj->GetBitmap2()) +static PyObject *_wrap_wxToolBarToolBase_GetBitmap2(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + wxBitmap * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_y_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetBitmap2",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetBitmap2. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_y_get(_arg0); + const wxBitmap & _result_ref = wxToolBarToolBase_GetBitmap2(_arg0); + _result = (wxBitmap *) &_result_ref; wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetBitmap(_swigobj) (_swigobj->GetBitmap()) +static PyObject *_wrap_wxToolBarToolBase_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; - long _arg1; + wxBitmap * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_width", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_width_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetBitmap",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetBitmap. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_width_set(_arg0,_arg1); + const wxBitmap & _result_ref = wxToolBarToolBase_GetBitmap(_arg0); + _result = (wxBitmap *) &_result_ref; wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_m_width_get(_swigobj) ((long ) _swigobj->m_width) -static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetShortHelp(_swigobj) (_swigobj->GetShortHelp()) +static PyObject *_wrap_wxToolBarToolBase_GetShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + wxString * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_width_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetShortHelp",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetShortHelp. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_width_get(_arg0); + _result = new wxString (wxToolBarToolBase_GetShortHelp(_arg0)); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); - return _resultobj; +}{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); } - -#define wxToolBarTool_m_height_set(_swigobj,_swigval) (_swigobj->m_height = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; - long _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","m_height", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_height_set",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_set. Expected _wxToolBarTool_p."); - return NULL; - } - } { - wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_height_set(_arg0,_arg1); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); + delete _result; +} return _resultobj; } -#define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height) -static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_GetLongHelp(_swigobj) (_swigobj->GetLongHelp()) +static PyObject *_wrap_wxToolBarToolBase_GetLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - long _result; - wxToolBarTool * _arg0; + wxString * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_height_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetLongHelp",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetLongHelp. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (long )wxToolBarTool_m_height_get(_arg0); + _result = new wxString (wxToolBarToolBase_GetLongHelp(_arg0)); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("l",_result); +}{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} return _resultobj; } -#define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_Enable(_swigobj,_swigarg0) (_swigobj->Enable(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; bool _arg1; PyObject * _argo0 = 0; int tempbool1; - char *_kwnames[] = { "self","m_toggleState", NULL }; + char *_kwnames[] = { "self","enable", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toggleState_set",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarToolBase_Enable",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_Enable. Expected _wxToolBarToolBase_p."); return NULL; } } _arg1 = (bool ) tempbool1; { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_toggleState_set(_arg0,_arg1); + _result = (bool )wxToolBarToolBase_Enable(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState) -static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_Toggle(_swigobj,_swigarg0) (_swigobj->Toggle(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; + bool _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + int tempbool1; + char *_kwnames[] = { "self","toggle", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toggleState_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarToolBase_Toggle",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_Toggle. Expected _wxToolBarToolBase_p."); return NULL; } } + _arg1 = (bool ) tempbool1; { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_toggleState_get(_arg0); + _result = (bool )wxToolBarToolBase_Toggle(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_SetToggle(_swigobj,_swigarg0) (_swigobj->SetToggle(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_SetToggle(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; bool _arg1; PyObject * _argo0 = 0; int tempbool1; - char *_kwnames[] = { "self","m_isToggle", NULL }; + char *_kwnames[] = { "self","toggle", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isToggle_set",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarToolBase_SetToggle",_kwnames,&_argo0,&tempbool1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetToggle. Expected _wxToolBarToolBase_p."); return NULL; } } _arg1 = (bool ) tempbool1; { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_isToggle_set(_arg0,_arg1); + _result = (bool )wxToolBarToolBase_SetToggle(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle) -static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_SetShortHelp(_swigobj,_swigarg0) (_swigobj->SetShortHelp(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_SetShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","help", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isToggle_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_SetShortHelp",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetShortHelp. Expected _wxToolBarToolBase_p."); return NULL; } } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_isToggle_get(_arg0); + _result = (bool )wxToolBarToolBase_SetShortHelp(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} return _resultobj; } -#define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_SetLongHelp(_swigobj,_swigarg0) (_swigobj->SetLongHelp(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_SetLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBarTool * _arg0; - bool _arg1; + wxToolBarToolBase * _arg0; + wxString * _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","m_deleteSecondBitmap", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","help", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_SetLongHelp",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetLongHelp. Expected _wxToolBarToolBase_p."); return NULL; } } - _arg1 = (bool ) tempbool1; +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_deleteSecondBitmap_set(_arg0,_arg1); + _result = (bool )wxToolBarToolBase_SetLongHelp(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); +{ + if (_obj1) + delete _arg1; +} return _resultobj; } -#define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap) -static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_SetBitmap1(_swigobj,_swigarg0) (_swigobj->SetBitmap1(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_SetBitmap1(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; + wxBitmap * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bmp", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_deleteSecondBitmap_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_SetBitmap1",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetBitmap1. Expected _wxToolBarToolBase_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarToolBase_SetBitmap1. Expected _wxBitmap_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_deleteSecondBitmap_get(_arg0); + wxToolBarToolBase_SetBitmap1(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_SetBitmap2(_swigobj,_swigarg0) (_swigobj->SetBitmap2(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_SetBitmap2(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBarTool * _arg0; - bool _arg1; + wxToolBarToolBase * _arg0; + wxBitmap * _arg1; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","m_enabled", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bmp", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_enabled_set",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_SetBitmap2",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetBitmap2. Expected _wxToolBarToolBase_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarToolBase_SetBitmap2. Expected _wxBitmap_p."); return NULL; } } - _arg1 = (bool ) tempbool1; { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_enabled_set(_arg0,_arg1); + wxToolBarToolBase_SetBitmap2(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled) -static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_Detach(_swigobj) (_swigobj->Detach()) +static PyObject *_wrap_wxToolBarToolBase_Detach(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_enabled_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_Detach",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_Detach. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_enabled_get(_arg0); + wxToolBarToolBase_Detach(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval) -static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarToolBase_Attach(_swigobj,_swigarg0) (_swigobj->Attach(_swigarg0)) +static PyObject *_wrap_wxToolBarToolBase_Attach(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxBitmap * _result; - wxToolBarTool * _arg0; - wxBitmap * _arg1; + wxToolBarToolBase * _arg0; + wxToolBarBase * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","m_bitmap1", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","tbar", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap1_set",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_Attach",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_Attach. Expected _wxToolBarToolBase_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarToolBase_Attach. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1); + wxToolBarToolBase_Attach(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1) -static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject * wxToolBarToolBase_GetClientData(wxToolBarToolBase *self) { + wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); + if (udata) { + Py_INCREF(udata->m_obj); + return udata->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } +static PyObject *_wrap_wxToolBarToolBase_GetClientData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxBitmap * _result; - wxToolBarTool * _arg0; + PyObject * _result; + wxToolBarToolBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap1_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetClientData",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetClientData. Expected _wxToolBarToolBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0); + _result = (PyObject *)wxToolBarToolBase_GetClientData(_arg0); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +}{ + _resultobj = _result; +} return _resultobj; } -#define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval) -static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args, PyObject *kwargs) { +static void wxToolBarToolBase_SetClientData(wxToolBarToolBase *self,PyObject * clientData) { + self->SetClientData(new wxPyUserData(clientData)); + } +static PyObject *_wrap_wxToolBarToolBase_SetClientData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxBitmap * _result; - wxToolBarTool * _arg0; - wxBitmap * _arg1; + wxToolBarToolBase * _arg0; + PyObject * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","m_bitmap2", NULL }; - char _ptemp[128]; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clientData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap2_set",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarToolBase_SetClientData",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_SetClientData. Expected _wxToolBarToolBase_p."); return NULL; } } +{ + _arg1 = _obj1; +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1); + wxToolBarToolBase_SetClientData(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2) -static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxToolBarBaseTowxControl(void *ptr) { + wxToolBarBase *src; + wxControl *dest; + src = (wxToolBarBase *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxToolBarBaseTowxWindow(void *ptr) { + wxToolBarBase *src; + wxWindow *dest; + src = (wxToolBarBase *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxToolBarBaseTowxEvtHandler(void *ptr) { + wxToolBarBase *src; + wxEvtHandler *dest; + src = (wxToolBarBase *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int toggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->AddTool(id, bitmap, pushedBitmap, (bool)toggle, + udata, shortHelpString, longHelpString); + } +static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxBitmap * _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + int _arg1; + wxBitmap * _arg2; + wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap; + int _arg4 = (int ) FALSE; + PyObject * _arg5 = (PyObject *) NULL; + wxString * _arg6 = (wxString *) &wxPyEmptyStr; + wxString * _arg7 = (wxString *) &wxPyEmptyStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo2 = 0; + PyObject * _argo3 = 0; + PyObject * _obj5 = 0; + PyObject * _obj6 = 0; + PyObject * _obj7 = 0; + char *_kwnames[] = { "self","id","bitmap","pushedBitmap","toggle","clientData","shortHelpString","longHelpString", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap2_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OiOOO:wxToolBarBase_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_obj5,&_obj6,&_obj7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddTool. Expected _wxToolBarBase_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); return NULL; } } + if (_argo3) { + if (_argo3 == Py_None) { _arg3 = NULL; } + else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = _obj5; +} + if (_obj6) +{ + if (!PyString_Check(_obj6)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg6 = new wxString(PyString_AsString(_obj6), PyString_Size(_obj6)); +} + if (_obj7) +{ + if (!PyString_Check(_obj7)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg7 = new wxString(PyString_AsString(_obj7), PyString_Size(_obj7)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0); + _result = (wxToolBarToolBase *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,*_arg6,*_arg7); wxPy_END_ALLOW_THREADS; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); _resultobj = Py_None; } +{ + if (_obj6) + delete _arg6; +} +{ + if (_obj7) + delete _arg7; +} return _resultobj; } -#define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval) -static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args, PyObject *kwargs) { +static wxToolBarToolBase * wxToolBarBase_AddSimpleTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int toggle) { + return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL, + shortHelpString, longHelpString); + } +static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBarTool * _arg0; - bool _arg1; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + int _arg1; + wxBitmap * _arg2; + wxString * _arg3 = (wxString *) &wxPyEmptyStr; + wxString * _arg4 = (wxString *) &wxPyEmptyStr; + int _arg5 = (int ) FALSE; PyObject * _argo0 = 0; - int tempbool1; - char *_kwnames[] = { "self","m_isMenuCommand", NULL }; + PyObject * _argo2 = 0; + PyObject * _obj3 = 0; + PyObject * _obj4 = 0; + char *_kwnames[] = { "self","id","bitmap","shortHelpString","longHelpString","toggle", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isMenuCommand_set",_kwnames,&_argo0,&tempbool1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOi:wxToolBarBase_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddSimpleTool. Expected _wxToolBarBase_p."); return NULL; } } - _arg1 = (bool ) tempbool1; + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddSimpleTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj3) +{ + if (!PyString_Check(_obj3)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3)); +} + if (_obj4) +{ + if (!PyString_Check(_obj4)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_isMenuCommand_set(_arg0,_arg1); + _result = (wxToolBarToolBase *)wxToolBarBase_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj3) + delete _arg3; +} +{ + if (_obj4) + delete _arg4; +} return _resultobj; } -#define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand) -static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args, PyObject *kwargs) { +static wxToolBarToolBase * wxToolBarBase_InsertTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int toggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)toggle, + udata, shortHelpString, longHelpString); + } +static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + size_t _arg1; + int _arg2; + wxBitmap * _arg3; + wxBitmap * _arg4 = (wxBitmap *) &wxNullBitmap; + int _arg5 = (int ) FALSE; + PyObject * _arg6 = (PyObject *) NULL; + wxString * _arg7 = (wxString *) &wxPyEmptyStr; + wxString * _arg8 = (wxString *) &wxPyEmptyStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo3 = 0; + PyObject * _argo4 = 0; + PyObject * _obj6 = 0; + PyObject * _obj7 = 0; + PyObject * _obj8 = 0; + char *_kwnames[] = { "self","pos","id","bitmap","pushedBitmap","toggle","clientData","shortHelpString","longHelpString", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isMenuCommand_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OiOOO:wxToolBarBase_InsertTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_obj6,&_obj7,&_obj8)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertTool. Expected _wxToolBarBase_p."); + return NULL; + } + } + if (_argo3) { + if (_argo3 == Py_None) { _arg3 = NULL; } + else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); return NULL; } } + if (_obj6) +{ + _arg6 = _obj6; +} + if (_obj7) +{ + if (!PyString_Check(_obj7)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg7 = new wxString(PyString_AsString(_obj7), PyString_Size(_obj7)); +} + if (_obj8) +{ + if (!PyString_Check(_obj8)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg8 = new wxString(PyString_AsString(_obj8), PyString_Size(_obj8)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBarTool_m_isMenuCommand_get(_arg0); + _result = (wxToolBarToolBase *)wxToolBarBase_InsertTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,*_arg7,*_arg8); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj7) + delete _arg7; +} +{ + if (_obj8) + delete _arg8; +} return _resultobj; } -#define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval) -static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) { +static wxToolBarToolBase * wxToolBarBase_InsertSimpleTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int toggle) { + return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL, + shortHelpString, longHelpString); + } +static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBarTool * _arg0; - wxString * _arg1; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + size_t _arg1; + int _arg2; + wxBitmap * _arg3; + wxString * _arg4 = (wxString *) &wxPyEmptyStr; + wxString * _arg5 = (wxString *) &wxPyEmptyStr; + int _arg6 = (int ) FALSE; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","m_shortHelpString", NULL }; + PyObject * _argo3 = 0; + PyObject * _obj4 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","pos","id","bitmap","shortHelpString","longHelpString","toggle", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_shortHelpString_set",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OOi:wxToolBarBase_InsertSimpleTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_obj4,&_obj5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertSimpleTool. Expected _wxToolBarBase_p."); + return NULL; + } + } + if (_argo3) { + if (_argo3 == Py_None) { _arg3 = NULL; } + else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_InsertSimpleTool. Expected _wxBitmap_p."); return NULL; } } + if (_obj4) { - if (!PyString_Check(_obj1)) { + if (!PyString_Check(_obj4)) { PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); + _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4)); +} + if (_obj5) +{ + if (!PyString_Check(_obj5)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg5 = new wxString(PyString_AsString(_obj5), PyString_Size(_obj5)); } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1); + _result = (wxToolBarToolBase *)wxToolBarBase_InsertSimpleTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj4) + delete _arg4; } { - if (_obj1) - delete _arg1; + if (_obj5) + delete _arg5; } return _resultobj; } -#define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString) -static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_AddControl(_swigobj,_swigarg0) (_swigobj->AddControl(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_AddControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + wxControl * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","control", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_shortHelpString_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarBase_AddControl",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddControl. Expected _wxToolBarBase_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarBase_AddControl. Expected _wxControl_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxString *)wxToolBarTool_m_shortHelpString_get(_arg0); + _result = (wxToolBarToolBase *)wxToolBarBase_AddControl(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); -} +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval) -static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_InsertControl(_swigobj,_swigarg0,_swigarg1) (_swigobj->InsertControl(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_InsertControl(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBarTool * _arg0; - wxString * _arg1; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + size_t _arg1; + wxControl * _arg2; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","m_longHelpString", NULL }; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","pos","control", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_longHelpString_set",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBarBase_InsertControl",_kwnames,&_argo0,&_arg1,&_argo2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertControl. Expected _wxToolBarBase_p."); return NULL; } } -{ - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxControl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_InsertControl. Expected _wxControl_p."); return NULL; + } } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); -} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1); + _result = (wxToolBarToolBase *)wxToolBarBase_InsertControl(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); -} -{ - if (_obj1) - delete _arg1; -} +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString) -static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_AddSeparator(_swigobj) (_swigobj->AddSeparator()) +static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBarTool * _arg0; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_longHelpString_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_AddSeparator",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarTool_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_get. Expected _wxToolBarTool_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddSeparator. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxString *)wxToolBarTool_m_longHelpString_get(_arg0); + _result = (wxToolBarToolBase *)wxToolBarBase_AddSeparator(_arg0); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); -} +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -static void *SwigwxToolBarTowxControl(void *ptr) { - wxToolBar *src; - wxControl *dest; - src = (wxToolBar *) ptr; - dest = (wxControl *) src; - return (void *) dest; -} +#define wxToolBarBase_InsertSeparator(_swigobj,_swigarg0) (_swigobj->InsertSeparator(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_InsertSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pos", NULL }; + char _ptemp[128]; -static void *SwigwxToolBarTowxWindow(void *ptr) { - wxToolBar *src; - wxWindow *dest; - src = (wxToolBar *) ptr; - dest = (wxWindow *) src; - return (void *) dest; -} + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_InsertSeparator",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertSeparator. Expected _wxToolBarBase_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxToolBarToolBase *)wxToolBarBase_InsertSeparator(_arg0,_arg1); -static void *SwigwxToolBarTowxEvtHandler(void *ptr) { - wxToolBar *src; - wxEvtHandler *dest; - src = (wxToolBar *) ptr; - dest = (wxEvtHandler *) src; - return (void *) dest; + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; } -#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_RemoveTool(_swigobj,_swigarg0) (_swigobj->RemoveTool(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_RemoveTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _result; - wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; - long _arg4 = (long ) wxTB_HORIZONTAL|wxNO_BORDER; - char * _arg5 = (char *) "toolBar"; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + int _arg1; PyObject * _argo0 = 0; - wxPoint temp; - PyObject * _obj2 = 0; - wxSize temp0; - PyObject * _obj3 = 0; - char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char *_kwnames[] = { "self","id", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_RemoveTool",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_RemoveTool. Expected _wxToolBarBase_p."); return NULL; } } - if (_obj2) -{ - _arg2 = &temp; - if (! wxPoint_helper(_obj2, &_arg2)) - return NULL; -} - if (_obj3) -{ - _arg3 = &temp0; - if (! wxSize_helper(_obj3, &_arg3)) - return NULL; -} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + _result = (wxToolBarToolBase *)wxToolBarBase_RemoveTool(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -1732,62 +1910,82 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k return _resultobj; } -#define wxToolBar_AddControl(_swigobj,_swigarg0) (_swigobj->AddControl(_swigarg0)) -static PyObject *_wrap_wxToolBar_AddControl(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_DeleteToolByPos(_swigobj,_swigarg0) (_swigobj->DeleteToolByPos(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_DeleteToolByPos(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; bool _result; - wxToolBar * _arg0; - wxControl * _arg1; + wxToolBarBase * _arg0; + size_t _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","control", NULL }; + char *_kwnames[] = { "self","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_AddControl",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_DeleteToolByPos",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddControl. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_DeleteToolByPos. Expected _wxToolBarBase_p."); return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_AddControl. Expected _wxControl_p."); +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxToolBarBase_DeleteToolByPos(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxToolBarBase_DeleteTool(_swigobj,_swigarg0) (_swigobj->DeleteTool(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_DeleteTool(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxToolBarBase * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","id", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_DeleteTool",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_DeleteTool. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBar_AddControl(_arg0,_arg1); + _result = (bool )wxToolBarBase_DeleteTool(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_AddSeparator(_swigobj) (_swigobj->AddSeparator()) -static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_ClearTools(_swigobj) (_swigobj->ClearTools()) +static PyObject *_wrap_wxToolBarBase_ClearTools(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_AddSeparator",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_ClearTools",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSeparator. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_ClearTools. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_AddSeparator(_arg0); + wxToolBarBase_ClearTools(_arg0); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -1795,704 +1993,722 @@ static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxToolBar_ClearTools(_swigobj) (_swigobj->ClearTools()) -static PyObject *_wrap_wxToolBar_ClearTools(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_Realize(_swigobj) (_swigobj->Realize()) +static PyObject *_wrap_wxToolBarBase_Realize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; + bool _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_ClearTools",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_Realize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ClearTools. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_Realize. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_ClearTools(_arg0); + _result = (bool )wxToolBarBase_Realize(_arg0); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -static wxToolBarTool * wxToolBar_AddTool(wxToolBar *self,int toolIndex,const wxBitmap & bitmap1,const wxBitmap & bitmap2,int isToggle,long xPos,long yPos,const wxString & shortHelpString,const wxString & longHelpString) { - return self->AddTool(toolIndex, bitmap1, bitmap2, - isToggle, xPos, yPos, NULL, - shortHelpString, longHelpString); - } -static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_EnableTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnableTool(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_EnableTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBarTool * _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; int _arg1; - wxBitmap * _arg2; - wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap; - int _arg4 = (int ) FALSE; - long _arg5 = (long ) -1; - long _arg6 = (long ) -1; - wxString * _arg7 = (wxString *) &wxPyEmptyStr; - wxString * _arg8 = (wxString *) &wxPyEmptyStr; + bool _arg2; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; - PyObject * _obj7 = 0; - PyObject * _obj8 = 0; - char *_kwnames[] = { "self","toolIndex","bitmap1","bitmap2","isToggle","xPos","yPos","shortHelpString","longHelpString", NULL }; - char _ptemp[128]; + int tempbool2; + char *_kwnames[] = { "self","id","enable", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OillOO:wxToolBar_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarBase_EnableTool",_kwnames,&_argo0,&_arg1,&tempbool2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddTool. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_EnableTool. Expected _wxToolBarBase_p."); return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddTool. Expected _wxBitmap_p."); + _arg2 = (bool ) tempbool2; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxToolBarBase_EnableTool(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxToolBarBase_ToggleTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->ToggleTool(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_ToggleTool(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarBase * _arg0; + int _arg1; + bool _arg2; + PyObject * _argo0 = 0; + int tempbool2; + char *_kwnames[] = { "self","id","toggle", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarBase_ToggleTool",_kwnames,&_argo0,&_arg1,&tempbool2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBar_AddTool. Expected _wxBitmap_p."); + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_ToggleTool. Expected _wxToolBarBase_p."); return NULL; } } - if (_obj7) + _arg2 = (bool ) tempbool2; { - if (!PyString_Check(_obj7)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + wxPy_BEGIN_ALLOW_THREADS; + wxToolBarBase_ToggleTool(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxToolBarBase_SetToggle(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToggle(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_SetToggle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarBase * _arg0; + int _arg1; + bool _arg2; + PyObject * _argo0 = 0; + int tempbool2; + char *_kwnames[] = { "self","id","toggle", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarBase_SetToggle",_kwnames,&_argo0,&_arg1,&tempbool2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToggle. Expected _wxToolBarBase_p."); return NULL; + } } - _arg7 = new wxString(PyString_AsString(_obj7), PyString_Size(_obj7)); -} - if (_obj8) + _arg2 = (bool ) tempbool2; { - if (!PyString_Check(_obj8)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + wxPy_BEGIN_ALLOW_THREADS; + wxToolBarBase_SetToggle(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject * wxToolBarBase_GetToolClientData(wxToolBarBase *self,int index) { + wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(index); + if (udata) { + Py_INCREF(udata->m_obj); + return udata->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } +static PyObject *_wrap_wxToolBarBase_GetToolClientData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxToolBarBase * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","index", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolClientData",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolClientData. Expected _wxToolBarBase_p."); return NULL; + } } - _arg8 = new wxString(PyString_AsString(_obj8), PyString_Size(_obj8)); -} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8); + _result = (PyObject *)wxToolBarBase_GetToolClientData(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } -{ - if (_obj7) - delete _arg7; -} -{ - if (_obj8) - delete _arg8; +}{ + _resultobj = _result; } return _resultobj; } -static wxToolBarTool * wxToolBar_AddSimpleTool(wxToolBar *self,int toolIndex,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString) { - return self->AddTool(toolIndex, bitmap, wxNullBitmap, - FALSE, -1, -1, NULL, - shortHelpString, longHelpString); +static void wxToolBarBase_SetToolClientData(wxToolBarBase *self,int index,PyObject * clientData) { + self->SetToolClientData(index, new wxPyUserData(clientData)); } -static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxToolBarBase_SetToolClientData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBarTool * _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; int _arg1; - wxBitmap * _arg2; - wxString * _arg3 = (wxString *) &wxPyEmptyStr; - wxString * _arg4 = (wxString *) &wxPyEmptyStr; + PyObject * _arg2; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _obj3 = 0; - PyObject * _obj4 = 0; - char *_kwnames[] = { "self","toolIndex","bitmap","shortHelpString","longHelpString", NULL }; - char _ptemp[128]; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","index","clientData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OO:wxToolBar_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBarBase_SetToolClientData",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSimpleTool. Expected _wxToolBar_p."); - return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddSimpleTool. Expected _wxBitmap_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolClientData. Expected _wxToolBarBase_p."); return NULL; } } - if (_obj3) -{ - if (!PyString_Check(_obj3)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3)); -} - if (_obj4) { - if (!PyString_Check(_obj4)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4)); + _arg2 = _obj2; } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4); + wxToolBarBase_SetToolClientData(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } -{ - if (_obj3) - delete _arg3; -} -{ - if (_obj4) - delete _arg4; -} +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->EnableTool(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; + bool _result; + wxToolBarBase * _arg0; int _arg1; - bool _arg2; PyObject * _argo0 = 0; - int tempbool2; - char *_kwnames[] = { "self","toolIndex","enable", NULL }; + char *_kwnames[] = { "self","id", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_EnableTool",_kwnames,&_argo0,&_arg1,&tempbool2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolState",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_EnableTool. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolState. Expected _wxToolBarBase_p."); return NULL; } } - _arg2 = (bool ) tempbool2; { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_EnableTool(_arg0,_arg1,_arg2); + _result = (bool )wxToolBarBase_GetToolState(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolEnabled(_swigobj,_swigarg0) (_swigobj->GetToolEnabled(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_GetToolEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBarTool * _result; - wxToolBar * _arg0; - long _arg1; - long _arg2; + bool _result; + wxToolBarBase * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","x","y", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","id", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxToolBar_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolEnabled",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolEnabled. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxToolBarTool *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2); + _result = (bool )wxToolBarBase_GetToolEnabled(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_GetToolSize(_swigobj) (_swigobj->GetToolSize()) -static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxSize * _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; + int _arg1; + wxString * _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","id","helpString", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBarBase_SetToolShortHelp",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSize. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolShortHelp. Expected _wxToolBarBase_p."); return NULL; } } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxSize (wxToolBar_GetToolSize(_arg0)); + wxToolBarBase_SetToolShortHelp(_arg0,_arg1,*_arg2); wxPy_END_ALLOW_THREADS; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); - _resultobj = Py_BuildValue("s",_ptemp); +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -#define wxToolBar_GetToolBitmapSize(_swigobj) (_swigobj->GetToolBitmapSize()) -static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolShortHelp(_swigobj,_swigarg0) (_swigobj->GetToolShortHelp(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxSize * _result; - wxToolBar * _arg0; + wxString * _result; + wxToolBarBase * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","id", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolBitmapSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolShortHelp",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolBitmapSize. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolShortHelp. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxSize (wxToolBar_GetToolBitmapSize(_arg0)); + _result = new wxString (wxToolBarBase_GetToolShortHelp(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); - _resultobj = Py_BuildValue("s",_ptemp); +}{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} return _resultobj; } -#define wxToolBar_SetToolBitmapSize(_swigobj,_swigarg0) (_swigobj->SetToolBitmapSize(_swigarg0)) -static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - wxSize * _arg1; + wxToolBarBase * _arg0; + int _arg1; + wxString * _arg2; PyObject * _argo0 = 0; - wxSize temp; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","size", NULL }; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","id","helpString", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetToolBitmapSize",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBarBase_SetToolLongHelp",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolBitmapSize. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolLongHelp. Expected _wxToolBarBase_p."); return NULL; } } { - _arg1 = &temp; - if (! wxSize_helper(_obj1, &_arg1)) + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToolBitmapSize(_arg0,*_arg1); + wxToolBarBase_SetToolLongHelp(_arg0,_arg1,*_arg2); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} return _resultobj; } -#define wxToolBar_GetToolMargins(_swigobj) (_swigobj->GetToolMargins()) -static PyObject *_wrap_wxToolBar_GetToolMargins(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolLongHelp(_swigobj,_swigarg0) (_swigobj->GetToolLongHelp(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxSize * _result; - wxToolBar * _arg0; + wxString * _result; + wxToolBarBase * _arg0; + int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","id", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolMargins",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolLongHelp",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolMargins. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolLongHelp. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxSize (wxToolBar_GetToolMargins(_arg0)); + _result = new wxString (wxToolBarBase_GetToolLongHelp(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); - _resultobj = Py_BuildValue("s",_ptemp); +}{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} return _resultobj; } -#define wxToolBar_GetMaxSize(_swigobj) (_swigobj->GetMaxSize()) -static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetMarginsXY(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetMargins(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_SetMarginsXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxSize * _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; + int _arg1; + int _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetMaxSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarBase_SetMarginsXY",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxSize. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetMarginsXY. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxSize (wxToolBar_GetMaxSize(_arg0)); + wxToolBarBase_SetMarginsXY(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); - _resultobj = Py_BuildValue("s",_ptemp); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_GetToolEnabled(_swigobj,_swigarg0) (_swigobj->GetToolEnabled(_swigarg0)) -static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetMargins(_swigobj,_swigarg0) (_swigobj->SetMargins(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBar * _arg0; - int _arg1; + wxToolBarBase * _arg0; + wxSize * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","toolIndex", NULL }; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolEnabled",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarBase_SetMargins",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolEnabled. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetMargins. Expected _wxToolBarBase_p."); return NULL; } } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBar_GetToolEnabled(_arg0,_arg1); + wxToolBarBase_SetMargins(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0) (_swigobj->GetToolLongHelp(_swigarg0)) -static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetToolPacking(_swigobj,_swigarg0) (_swigobj->SetToolPacking(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_SetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","toolIndex", NULL }; + char *_kwnames[] = { "self","packing", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolLongHelp",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_SetToolPacking",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolPacking. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1)); + wxToolBarBase_SetToolPacking(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; } + +#define wxToolBarBase_SetToolSeparation(_swigobj,_swigarg0) (_swigobj->SetToolSeparation(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_SetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarBase * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","separation", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_SetToolSeparation",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolSeparation. Expected _wxToolBarBase_p."); + return NULL; + } + } { - delete _result; -} + wxPy_BEGIN_ALLOW_THREADS; + wxToolBarBase_SetToolSeparation(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_GetToolPacking(_swigobj) (_swigobj->GetToolPacking()) -static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolMargins(_swigobj) (_swigobj->GetToolMargins()) +static PyObject *_wrap_wxToolBarBase_GetToolMargins(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxToolBar * _arg0; + wxSize * _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolPacking",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetToolMargins",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolMargins. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBar_GetToolPacking(_arg0); + _result = new wxSize (wxToolBarBase_GetToolMargins(_arg0)); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBar_GetToolSeparation(_swigobj) (_swigobj->GetToolSeparation()) -static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolPacking(_swigobj) (_swigobj->GetToolPacking()) +static PyObject *_wrap_wxToolBarBase_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolSeparation",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetToolPacking",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolPacking. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBar_GetToolSeparation(_arg0); + _result = (int )wxToolBarBase_GetToolPacking(_arg0); wxPy_END_ALLOW_THREADS; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0) (_swigobj->GetToolShortHelp(_swigarg0)) -static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolSeparation(_swigobj) (_swigobj->GetToolSeparation()) +static PyObject *_wrap_wxToolBarBase_GetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxToolBar * _arg0; - int _arg1; + int _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","toolIndex", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolShortHelp",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetToolSeparation",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSeparation. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1)); + _result = (int )wxToolBarBase_GetToolSeparation(_arg0); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) -static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetRows(_swigobj,_swigarg0) (_swigobj->SetRows(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_SetRows(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxToolBar * _arg0; + wxToolBarBase * _arg0; int _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","toolIndex", NULL }; + char *_kwnames[] = { "self","nRows", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolState",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_SetRows",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolState. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetRows. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBar_GetToolState(_arg0,_arg1); + wxToolBarBase_SetRows(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_Realize(_swigobj) (_swigobj->Realize()) -static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxToolBar * _arg0; +#define wxToolBarBase_SetMaxRowsCols(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetMaxRowsCols(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarBase * _arg0; + int _arg1; + int _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","rows","cols", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_Realize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarBase_SetMaxRowsCols",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_Realize. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetMaxRowsCols. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxToolBar_Realize(_arg0); + wxToolBarBase_SetMaxRowsCols(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetMaxRows(_swigobj) (_swigobj->GetMaxRows()) +static PyObject *_wrap_wxToolBarBase_GetMaxRows(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; - wxString * _arg2; + int _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","toolIndex","helpString", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolLongHelp",_kwnames,&_argo0,&_arg1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetMaxRows",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetMaxRows. Expected _wxToolBarBase_p."); return NULL; } } -{ - if (!PyString_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); -} { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToolLongHelp(_arg0,_arg1,*_arg2); + _result = (int )wxToolBarBase_GetMaxRows(_arg0); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - if (_obj2) - delete _arg2; -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetMaxCols(_swigobj) (_swigobj->GetMaxCols()) +static PyObject *_wrap_wxToolBarBase_GetMaxCols(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; - wxString * _arg2; + int _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; - PyObject * _obj2 = 0; - char *_kwnames[] = { "self","toolIndex","helpString", NULL }; + char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolShortHelp",_kwnames,&_argo0,&_arg1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetMaxCols",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetMaxCols. Expected _wxToolBarBase_p."); return NULL; } } -{ - if (!PyString_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); -} { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToolShortHelp(_arg0,_arg1,*_arg2); + _result = (int )wxToolBarBase_GetMaxCols(_arg0); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; -{ - if (_obj2) - delete _arg2; -} +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxToolBar_SetMargins(_swigobj,_swigarg0) (_swigobj->SetMargins(_swigarg0)) -static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_SetToolBitmapSize(_swigobj,_swigarg0) (_swigobj->SetToolBitmapSize(_swigarg0)) +static PyObject *_wrap_wxToolBarBase_SetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; + wxToolBarBase * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; wxSize temp; @@ -2500,12 +2716,12 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyOb char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetMargins",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarBase_SetToolBitmapSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMargins. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolBitmapSize. Expected _wxToolBarBase_p."); return NULL; } } @@ -2516,7 +2732,7 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyOb } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetMargins(_arg0,*_arg1); + wxToolBarBase_SetToolBitmapSize(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -2524,276 +2740,406 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyOb return _resultobj; } -#define wxToolBar_SetToolPacking(_swigobj,_swigarg0) (_swigobj->SetToolPacking(_swigarg0)) -static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolBitmapSize(_swigobj) (_swigobj->GetToolBitmapSize()) +static PyObject *_wrap_wxToolBarBase_GetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; + wxSize * _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","packing", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolPacking",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetToolBitmapSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolPacking. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolBitmapSize. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToolPacking(_arg0,_arg1); + _result = new wxSize (wxToolBarBase_GetToolBitmapSize(_arg0)); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBar_SetToolSeparation(_swigobj,_swigarg0) (_swigobj->SetToolSeparation(_swigarg0)) -static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarBase_GetToolSize(_swigobj) (_swigobj->GetToolSize()) +static PyObject *_wrap_wxToolBarBase_GetToolSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; + wxSize * _result; + wxToolBarBase * _arg0; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","separation", NULL }; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolSeparation",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetToolSize",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolSeparation. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSize. Expected _wxToolBarBase_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToolSeparation(_arg0,_arg1); + _result = new wxSize (wxToolBarBase_GetToolSize(_arg0)); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } -#define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1) (_swigobj->ToggleTool(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxToolBarTowxToolBarBase(void *ptr) { + wxToolBar *src; + wxToolBarBase *dest; + src = (wxToolBar *) ptr; + dest = (wxToolBarBase *) src; + return (void *) dest; +} + +static void *SwigwxToolBarTowxControl(void *ptr) { + wxToolBar *src; + wxControl *dest; + src = (wxToolBar *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxToolBarTowxWindow(void *ptr) { + wxToolBar *src; + wxWindow *dest; + src = (wxToolBar *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxToolBarTowxEvtHandler(void *ptr) { + wxToolBar *src; + wxEvtHandler *dest; + src = (wxToolBar *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; - bool _arg2; + wxToolBar * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + wxString * _arg5 = (wxString *) &wxToolBarNameStr; PyObject * _argo0 = 0; - int tempbool2; - char *_kwnames[] = { "self","toolIndex","toggle", NULL }; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_ToggleTool",_kwnames,&_argo0,&_arg1,&tempbool2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ToggleTool. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p."); return NULL; } } - _arg2 = (bool ) tempbool2; + if (_obj2) { - wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_ToggleTool(_arg0,_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) + return NULL; } - -#define wxToolBar_SetToggle(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToggle(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_SetToggle(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxToolBar * _arg0; - int _arg1; - bool _arg2; - PyObject * _argo0 = 0; - int tempbool2; - char *_kwnames[] = { "self","toolIndex","toggle", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_SetToggle",_kwnames,&_argo0,&_arg1,&tempbool2)) + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToggle. Expected _wxToolBar_p."); +} + if (_obj5) +{ + if (!PyString_Check(_obj5)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); return NULL; - } } - _arg2 = (bool ) tempbool2; + _arg5 = new wxString(PyString_AsString(_obj5), PyString_Size(_obj5)); +} { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetToggle(_arg0,_arg1,_arg2); + _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj5) + delete _arg5; +} return _resultobj; } -#define wxToolBar_SetMaxRowsCols(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetMaxRowsCols(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxToolBar_SetMaxRowsCols(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBar_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; + wxToolBarToolBase * _result; wxToolBar * _arg0; - int _arg1; - int _arg2; + wxCoord _arg1; + wxCoord _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self","rows","cols", NULL }; + char *_kwnames[] = { "self","x","y", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_SetMaxRowsCols",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMaxRowsCols. Expected _wxToolBar_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxToolBar_SetMaxRowsCols(_arg0,_arg1,_arg2); + _result = (wxToolBarToolBase *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } -#define wxToolBar_GetMaxRows(_swigobj) (_swigobj->GetMaxRows()) -static PyObject *_wrap_wxToolBar_GetMaxRows(PyObject *self, PyObject *args, PyObject *kwargs) { +static void *SwigwxToolBarSimpleTowxToolBarBase(void *ptr) { + wxToolBarSimple *src; + wxToolBarBase *dest; + src = (wxToolBarSimple *) ptr; + dest = (wxToolBarBase *) src; + return (void *) dest; +} + +static void *SwigwxToolBarSimpleTowxControl(void *ptr) { + wxToolBarSimple *src; + wxControl *dest; + src = (wxToolBarSimple *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxToolBarSimpleTowxWindow(void *ptr) { + wxToolBarSimple *src; + wxWindow *dest; + src = (wxToolBarSimple *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxToolBarSimpleTowxEvtHandler(void *ptr) { + wxToolBarSimple *src; + wxEvtHandler *dest; + src = (wxToolBarSimple *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxToolBar * _arg0; + wxToolBarSimple * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition; + wxSize * _arg3 = (wxSize *) &wxPyDefaultSize; + long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL; + wxString * _arg5 = (wxString *) &wxToolBarNameStr; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetMaxRows",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlO:new_wxToolBarSimple",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxRows. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBarSimple. Expected _wxWindow_p."); return NULL; } } + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) + return NULL; +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) + return NULL; +} + if (_obj5) +{ + if (!PyString_Check(_obj5)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg5 = new wxString(PyString_AsString(_obj5), PyString_Size(_obj5)); +} { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBar_GetMaxRows(_arg0); + _result = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarSimple_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj5) + delete _arg5; +} return _resultobj; } -#define wxToolBar_GetMaxCols(_swigobj) (_swigobj->GetMaxCols()) -static PyObject *_wrap_wxToolBar_GetMaxCols(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxToolBarSimple_FindToolForPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->FindToolForPosition(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBarSimple_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - int _result; - wxToolBar * _arg0; + wxToolBarToolBase * _result; + wxToolBarSimple * _arg0; + wxCoord _arg1; + wxCoord _arg2; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + char *_kwnames[] = { "self","x","y", NULL }; + char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetMaxCols",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarSimple_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxCols. Expected _wxToolBar_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarSimple_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarSimple_FindToolForPosition. Expected _wxToolBarSimple_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (int )wxToolBar_GetMaxCols(_arg0); + _result = (wxToolBarToolBase *)wxToolBarSimple_FindToolForPosition(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } return _resultobj; } static PyMethodDef stattoolcMethods[] = { - { "wxToolBar_GetMaxCols", (PyCFunction) _wrap_wxToolBar_GetMaxCols, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetMaxRows", (PyCFunction) _wrap_wxToolBar_GetMaxRows, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetMaxRowsCols", (PyCFunction) _wrap_wxToolBar_SetMaxRowsCols, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToggle", (PyCFunction) _wrap_wxToolBar_SetToggle, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_ToggleTool", (PyCFunction) _wrap_wxToolBar_ToggleTool, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToolSeparation", (PyCFunction) _wrap_wxToolBar_SetToolSeparation, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToolPacking", (PyCFunction) _wrap_wxToolBar_SetToolPacking, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetMargins", (PyCFunction) _wrap_wxToolBar_SetMargins, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToolShortHelp", (PyCFunction) _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToolLongHelp", (PyCFunction) _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_Realize", (PyCFunction) _wrap_wxToolBar_Realize, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolState", (PyCFunction) _wrap_wxToolBar_GetToolState, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolShortHelp", (PyCFunction) _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolSeparation", (PyCFunction) _wrap_wxToolBar_GetToolSeparation, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolPacking", (PyCFunction) _wrap_wxToolBar_GetToolPacking, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolLongHelp", (PyCFunction) _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolEnabled", (PyCFunction) _wrap_wxToolBar_GetToolEnabled, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetMaxSize", (PyCFunction) _wrap_wxToolBar_GetMaxSize, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolMargins", (PyCFunction) _wrap_wxToolBar_GetToolMargins, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_SetToolBitmapSize", (PyCFunction) _wrap_wxToolBar_SetToolBitmapSize, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolBitmapSize", (PyCFunction) _wrap_wxToolBar_GetToolBitmapSize, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_GetToolSize", (PyCFunction) _wrap_wxToolBar_GetToolSize, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarSimple_FindToolForPosition", (PyCFunction) _wrap_wxToolBarSimple_FindToolForPosition, METH_VARARGS | METH_KEYWORDS }, + { "new_wxToolBarSimple", (PyCFunction) _wrap_new_wxToolBarSimple, METH_VARARGS | METH_KEYWORDS }, { "wxToolBar_FindToolForPosition", (PyCFunction) _wrap_wxToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_EnableTool", (PyCFunction) _wrap_wxToolBar_EnableTool, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_AddSimpleTool", (PyCFunction) _wrap_wxToolBar_AddSimpleTool, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_AddTool", (PyCFunction) _wrap_wxToolBar_AddTool, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_ClearTools", (PyCFunction) _wrap_wxToolBar_ClearTools, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_AddSeparator", (PyCFunction) _wrap_wxToolBar_AddSeparator, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBar_AddControl", (PyCFunction) _wrap_wxToolBar_AddControl, METH_VARARGS | METH_KEYWORDS }, { "new_wxToolBar", (PyCFunction) _wrap_new_wxToolBar, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_longHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_longHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_shortHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_shortHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_isMenuCommand_get", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_isMenuCommand_set", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_bitmap2_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_bitmap2_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_bitmap1_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_bitmap1_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_enabled_get", (PyCFunction) _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_enabled_set", (PyCFunction) _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_deleteSecondBitmap_get", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_deleteSecondBitmap_set", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_isToggle_get", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_isToggle_set", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_toggleState_get", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_toggleState_set", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_height_get", (PyCFunction) _wrap_wxToolBarTool_m_height_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_height_set", (PyCFunction) _wrap_wxToolBarTool_m_height_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_width_get", (PyCFunction) _wrap_wxToolBarTool_m_width_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_width_set", (PyCFunction) _wrap_wxToolBarTool_m_width_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_y_get", (PyCFunction) _wrap_wxToolBarTool_m_y_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_y_set", (PyCFunction) _wrap_wxToolBarTool_m_y_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_x_get", (PyCFunction) _wrap_wxToolBarTool_m_x_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_x_set", (PyCFunction) _wrap_wxToolBarTool_m_x_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_index_get", (PyCFunction) _wrap_wxToolBarTool_m_index_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_index_set", (PyCFunction) _wrap_wxToolBarTool_m_index_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_clientData_get", (PyCFunction) _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_clientData_set", (PyCFunction) _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_toolStyle_get", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_m_toolStyle_set", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_GetControl", (PyCFunction) _wrap_wxToolBarTool_GetControl, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_GetHeight", (PyCFunction) _wrap_wxToolBarTool_GetHeight, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_GetWidth", (PyCFunction) _wrap_wxToolBarTool_GetWidth, METH_VARARGS | METH_KEYWORDS }, - { "wxToolBarTool_SetSize", (PyCFunction) _wrap_wxToolBarTool_SetSize, METH_VARARGS | METH_KEYWORDS }, - { "delete_wxToolBarTool", (PyCFunction) _wrap_delete_wxToolBarTool, METH_VARARGS | METH_KEYWORDS }, - { "new_wxToolBarTool", (PyCFunction) _wrap_new_wxToolBarTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolSize", (PyCFunction) _wrap_wxToolBarBase_GetToolSize, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolBitmapSize", (PyCFunction) _wrap_wxToolBarBase_GetToolBitmapSize, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolBitmapSize", (PyCFunction) _wrap_wxToolBarBase_SetToolBitmapSize, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetMaxCols", (PyCFunction) _wrap_wxToolBarBase_GetMaxCols, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetMaxRows", (PyCFunction) _wrap_wxToolBarBase_GetMaxRows, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetMaxRowsCols", (PyCFunction) _wrap_wxToolBarBase_SetMaxRowsCols, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetRows", (PyCFunction) _wrap_wxToolBarBase_SetRows, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolSeparation", (PyCFunction) _wrap_wxToolBarBase_GetToolSeparation, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolPacking", (PyCFunction) _wrap_wxToolBarBase_GetToolPacking, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolMargins", (PyCFunction) _wrap_wxToolBarBase_GetToolMargins, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolSeparation", (PyCFunction) _wrap_wxToolBarBase_SetToolSeparation, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolPacking", (PyCFunction) _wrap_wxToolBarBase_SetToolPacking, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetMargins", (PyCFunction) _wrap_wxToolBarBase_SetMargins, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetMarginsXY", (PyCFunction) _wrap_wxToolBarBase_SetMarginsXY, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolLongHelp", (PyCFunction) _wrap_wxToolBarBase_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolLongHelp", (PyCFunction) _wrap_wxToolBarBase_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolShortHelp", (PyCFunction) _wrap_wxToolBarBase_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolShortHelp", (PyCFunction) _wrap_wxToolBarBase_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolEnabled", (PyCFunction) _wrap_wxToolBarBase_GetToolEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolState", (PyCFunction) _wrap_wxToolBarBase_GetToolState, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToolClientData", (PyCFunction) _wrap_wxToolBarBase_SetToolClientData, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_GetToolClientData", (PyCFunction) _wrap_wxToolBarBase_GetToolClientData, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_SetToggle", (PyCFunction) _wrap_wxToolBarBase_SetToggle, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_ToggleTool", (PyCFunction) _wrap_wxToolBarBase_ToggleTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_EnableTool", (PyCFunction) _wrap_wxToolBarBase_EnableTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_Realize", (PyCFunction) _wrap_wxToolBarBase_Realize, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_ClearTools", (PyCFunction) _wrap_wxToolBarBase_ClearTools, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_DeleteTool", (PyCFunction) _wrap_wxToolBarBase_DeleteTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_DeleteToolByPos", (PyCFunction) _wrap_wxToolBarBase_DeleteToolByPos, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_RemoveTool", (PyCFunction) _wrap_wxToolBarBase_RemoveTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_InsertSeparator", (PyCFunction) _wrap_wxToolBarBase_InsertSeparator, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddSeparator", (PyCFunction) _wrap_wxToolBarBase_AddSeparator, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_InsertControl", (PyCFunction) _wrap_wxToolBarBase_InsertControl, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddControl", (PyCFunction) _wrap_wxToolBarBase_AddControl, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_InsertSimpleTool", (PyCFunction) _wrap_wxToolBarBase_InsertSimpleTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_InsertTool", (PyCFunction) _wrap_wxToolBarBase_InsertTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddSimpleTool", (PyCFunction) _wrap_wxToolBarBase_AddSimpleTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddTool", (PyCFunction) _wrap_wxToolBarBase_AddTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetClientData", (PyCFunction) _wrap_wxToolBarToolBase_SetClientData, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetClientData", (PyCFunction) _wrap_wxToolBarToolBase_GetClientData, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_Attach", (PyCFunction) _wrap_wxToolBarToolBase_Attach, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_Detach", (PyCFunction) _wrap_wxToolBarToolBase_Detach, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetBitmap2", (PyCFunction) _wrap_wxToolBarToolBase_SetBitmap2, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetBitmap1", (PyCFunction) _wrap_wxToolBarToolBase_SetBitmap1, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetLongHelp", (PyCFunction) _wrap_wxToolBarToolBase_SetLongHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetShortHelp", (PyCFunction) _wrap_wxToolBarToolBase_SetShortHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_SetToggle", (PyCFunction) _wrap_wxToolBarToolBase_SetToggle, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_Toggle", (PyCFunction) _wrap_wxToolBarToolBase_Toggle, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_Enable", (PyCFunction) _wrap_wxToolBarToolBase_Enable, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetLongHelp", (PyCFunction) _wrap_wxToolBarToolBase_GetLongHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetShortHelp", (PyCFunction) _wrap_wxToolBarToolBase_GetShortHelp, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetBitmap", (PyCFunction) _wrap_wxToolBarToolBase_GetBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetBitmap2", (PyCFunction) _wrap_wxToolBarToolBase_GetBitmap2, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetBitmap1", (PyCFunction) _wrap_wxToolBarToolBase_GetBitmap1, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_CanBeToggled", (PyCFunction) _wrap_wxToolBarToolBase_CanBeToggled, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_IsToggled", (PyCFunction) _wrap_wxToolBarToolBase_IsToggled, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_IsEnabled", (PyCFunction) _wrap_wxToolBarToolBase_IsEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetStyle", (PyCFunction) _wrap_wxToolBarToolBase_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_IsSeparator", (PyCFunction) _wrap_wxToolBarToolBase_IsSeparator, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_IsControl", (PyCFunction) _wrap_wxToolBarToolBase_IsControl, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_IsButton", (PyCFunction) _wrap_wxToolBarToolBase_IsButton, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetToolBar", (PyCFunction) _wrap_wxToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetControl", (PyCFunction) _wrap_wxToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetId", (PyCFunction) _wrap_wxToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_Destroy", (PyCFunction) _wrap_wxToolBarToolBase_Destroy, METH_VARARGS | METH_KEYWORDS }, { "wxStatusBar_SetStatusWidths", (PyCFunction) _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS }, { "wxStatusBar_SetStatusText", (PyCFunction) _wrap_wxStatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS }, { "wxStatusBar_SetFieldsCount", (PyCFunction) _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS }, @@ -2833,8 +3179,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxRegionIterator","_wxRegionIterator",0}, { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, { "_class_wxMenuBar","_wxMenuBar",0}, + { "_class_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler}, + { "_class_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler}, { "_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler}, { "_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler}, + { "_class_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler}, + { "_class_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler}, { "_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler}, { "_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler}, { "_class_wxEvtHandler","_wxEvtHandler",0}, @@ -2842,6 +3192,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_class_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase}, + { "_class_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase}, + { "_class_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase}, + { "_class_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, { "_wxPen","_class_wxPen",0}, { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, @@ -2919,17 +3274,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, @@ -2939,7 +3295,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxDataFormat","_wxDataFormat",0}, { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_wxGDIImage","_class_wxGDIImage",0}, { "_wxStaticText","_class_wxStaticText",0}, { "_wxFont","_class_wxFont",0}, { "_class_wxPyDropTarget","_wxPyDropTarget",0}, @@ -2973,6 +3328,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, @@ -2980,8 +3336,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxBrush","_wxBrush",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_class_wxWindow","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow}, + { "_class_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow}, { "_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow}, { "_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow}, + { "_class_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow}, + { "_class_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow}, { "_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow}, { "_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow}, { "_class_wxWindow","_wxWindow",0}, @@ -3008,7 +3368,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -3016,8 +3375,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_char","_byte",0}, { "_class_wxMetaFileDC","_wxMetaFileDC",0}, { "_class_wxMenu","_wxMenu",0}, + { "_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl}, + { "_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl}, { "_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl}, { "_wxControl","_wxToolBar",SwigwxToolBarTowxControl}, + { "_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl}, + { "_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl}, { "_wxControl","_class_wxControl",0}, { "_class_wxListBox","_wxListBox",0}, { "_unsigned_int","_wxCoord",0}, @@ -3041,7 +3404,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxSlider","_wxSlider",0}, { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_class_wxGDIImage","_wxGDIImage",0}, { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -3077,10 +3439,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase}, + { "_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase}, + { "_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase}, + { "_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxIconizeEvent","_class_wxIconizeEvent",0}, + { "_class_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl}, + { "_class_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl}, { "_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl}, { "_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl}, + { "_class_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl}, + { "_class_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl}, { "_class_wxControl","_wxControl",0}, { "_wxStaticBitmap","_class_wxStaticBitmap",0}, { "_class_wxIcon","_wxIcon",0}, @@ -3115,8 +3486,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMemoryDC","_wxMemoryDC",0}, { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0}, { "_wxMenuBar","_class_wxMenuBar",0}, + { "_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler}, + { "_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler}, { "_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler}, { "_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler}, + { "_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler}, + { "_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler}, { "_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler}, { "_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler}, { "_wxEvtHandler","_class_wxEvtHandler",0}, @@ -3131,8 +3506,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFileDataObject","_class_wxFileDataObject",0}, { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, + { "_wxWindow","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow}, + { "_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow}, { "_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow}, { "_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow}, + { "_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow}, + { "_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow}, { "_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow}, { "_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow}, { "_wxWindow","_class_wxWindow",0}, @@ -3148,6 +3528,9 @@ SWIGEXPORT(void) initstattoolc() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("stattoolc", stattoolcMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"wxTOOL_STYLE_BUTTON", PyInt_FromLong((long) wxTOOL_STYLE_BUTTON)); + PyDict_SetItemString(d,"wxTOOL_STYLE_SEPARATOR", PyInt_FromLong((long) wxTOOL_STYLE_SEPARATOR)); + PyDict_SetItemString(d,"wxTOOL_STYLE_CONTROL", PyInt_FromLong((long) wxTOOL_STYLE_CONTROL)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/utils/wxPython/src/msw/stattool.py b/utils/wxPython/src/msw/stattool.py index e41d5b837f..1c54ead378 100644 --- a/utils/wxPython/src/msw/stattool.py +++ b/utils/wxPython/src/msw/stattool.py @@ -56,217 +56,251 @@ class wxStatusBar(wxStatusBarPtr): -class wxToolBarToolPtr : +class wxToolBarToolBasePtr : def __init__(self,this): self.this = this self.thisown = 0 - def __del__(self,stattoolc=stattoolc): - if self.thisown == 1 : - stattoolc.delete_wxToolBarTool(self) - def SetSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarTool_SetSize,(self,) + _args, _kwargs) + def Destroy(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_Destroy,(self,) + _args, _kwargs) return val - def GetWidth(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarTool_GetWidth,(self,) + _args, _kwargs) - return val - def GetHeight(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarTool_GetHeight,(self,) + _args, _kwargs) + def GetId(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetId,(self,) + _args, _kwargs) return val def GetControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBarTool_GetControl,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarToolBase_GetControl,(self,) + _args, _kwargs) if val: val = wxControlPtr(val) return val - def __setattr__(self,name,value): - if name == "m_toolStyle" : - stattoolc.wxToolBarTool_m_toolStyle_set(self,value) - return - if name == "m_clientData" : - stattoolc.wxToolBarTool_m_clientData_set(self,value) - return - if name == "m_index" : - stattoolc.wxToolBarTool_m_index_set(self,value) - return - if name == "m_x" : - stattoolc.wxToolBarTool_m_x_set(self,value) - return - if name == "m_y" : - stattoolc.wxToolBarTool_m_y_set(self,value) - return - if name == "m_width" : - stattoolc.wxToolBarTool_m_width_set(self,value) - return - if name == "m_height" : - stattoolc.wxToolBarTool_m_height_set(self,value) - return - if name == "m_toggleState" : - stattoolc.wxToolBarTool_m_toggleState_set(self,value) - return - if name == "m_isToggle" : - stattoolc.wxToolBarTool_m_isToggle_set(self,value) - return - if name == "m_deleteSecondBitmap" : - stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self,value) - return - if name == "m_enabled" : - stattoolc.wxToolBarTool_m_enabled_set(self,value) - return - if name == "m_bitmap1" : - stattoolc.wxToolBarTool_m_bitmap1_set(self,value.this) - return - if name == "m_bitmap2" : - stattoolc.wxToolBarTool_m_bitmap2_set(self,value.this) - return - if name == "m_isMenuCommand" : - stattoolc.wxToolBarTool_m_isMenuCommand_set(self,value) - return - if name == "m_shortHelpString" : - stattoolc.wxToolBarTool_m_shortHelpString_set(self,value) - return - if name == "m_longHelpString" : - stattoolc.wxToolBarTool_m_longHelpString_set(self,value) - return - self.__dict__[name] = value - def __getattr__(self,name): - if name == "m_toolStyle" : - return stattoolc.wxToolBarTool_m_toolStyle_get(self) - if name == "m_clientData" : - return stattoolc.wxToolBarTool_m_clientData_get(self) - if name == "m_index" : - return stattoolc.wxToolBarTool_m_index_get(self) - if name == "m_x" : - return stattoolc.wxToolBarTool_m_x_get(self) - if name == "m_y" : - return stattoolc.wxToolBarTool_m_y_get(self) - if name == "m_width" : - return stattoolc.wxToolBarTool_m_width_get(self) - if name == "m_height" : - return stattoolc.wxToolBarTool_m_height_get(self) - if name == "m_toggleState" : - return stattoolc.wxToolBarTool_m_toggleState_get(self) - if name == "m_isToggle" : - return stattoolc.wxToolBarTool_m_isToggle_get(self) - if name == "m_deleteSecondBitmap" : - return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self) - if name == "m_enabled" : - return stattoolc.wxToolBarTool_m_enabled_get(self) - if name == "m_bitmap1" : - return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self)) - if name == "m_bitmap2" : - return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self)) - if name == "m_isMenuCommand" : - return stattoolc.wxToolBarTool_m_isMenuCommand_get(self) - if name == "m_shortHelpString" : - return stattoolc.wxToolBarTool_m_shortHelpString_get(self) - if name == "m_longHelpString" : - return stattoolc.wxToolBarTool_m_longHelpString_get(self) - raise AttributeError,name + def GetToolBar(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetToolBar,(self,) + _args, _kwargs) + if val: val = wxToolBarBasePtr(val) + return val + def IsButton(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_IsButton,(self,) + _args, _kwargs) + return val + def IsControl(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_IsControl,(self,) + _args, _kwargs) + return val + def IsSeparator(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_IsSeparator,(self,) + _args, _kwargs) + return val + def GetStyle(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetStyle,(self,) + _args, _kwargs) + return val + def IsEnabled(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_IsEnabled,(self,) + _args, _kwargs) + return val + def IsToggled(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_IsToggled,(self,) + _args, _kwargs) + return val + def CanBeToggled(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_CanBeToggled,(self,) + _args, _kwargs) + return val + def GetBitmap1(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetBitmap1,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) + return val + def GetBitmap2(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetBitmap2,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) + return val + def GetBitmap(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetBitmap,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) + return val + def GetShortHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetShortHelp,(self,) + _args, _kwargs) + return val + def GetLongHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetLongHelp,(self,) + _args, _kwargs) + return val + def Enable(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_Enable,(self,) + _args, _kwargs) + return val + def Toggle(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_Toggle,(self,) + _args, _kwargs) + return val + def SetToggle(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetToggle,(self,) + _args, _kwargs) + return val + def SetShortHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetShortHelp,(self,) + _args, _kwargs) + return val + def SetLongHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetLongHelp,(self,) + _args, _kwargs) + return val + def SetBitmap1(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetBitmap1,(self,) + _args, _kwargs) + return val + def SetBitmap2(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetBitmap2,(self,) + _args, _kwargs) + return val + def Detach(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_Detach,(self,) + _args, _kwargs) + return val + def Attach(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_Attach,(self,) + _args, _kwargs) + return val + def GetClientData(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetClientData,(self,) + _args, _kwargs) + return val + def SetClientData(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_SetClientData,(self,) + _args, _kwargs) + return val def __repr__(self): - return "" % (self.this,) -class wxToolBarTool(wxToolBarToolPtr): - def __init__(self,*_args,**_kwargs): - self.this = apply(stattoolc.new_wxToolBarTool,_args,_kwargs) - self.thisown = 1 + return "" % (self.this,) +class wxToolBarToolBase(wxToolBarToolBasePtr): + def __init__(self,this): + self.this = this -class wxToolBarPtr(wxControlPtr): +class wxToolBarBasePtr(wxControlPtr): def __init__(self,this): self.this = this self.thisown = 0 - def AddControl(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_AddControl,(self,) + _args, _kwargs) + def AddTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddTool,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def AddSeparator(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_AddSeparator,(self,) + _args, _kwargs) + def AddSimpleTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddSimpleTool,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def ClearTools(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_ClearTools,(self,) + _args, _kwargs) + def InsertTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_InsertTool,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def AddTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_AddTool,(self,) + _args, _kwargs) - if val: val = wxToolBarToolPtr(val) + def InsertSimpleTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_InsertSimpleTool,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def AddSimpleTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_AddSimpleTool,(self,) + _args, _kwargs) - if val: val = wxToolBarToolPtr(val) + def AddControl(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddControl,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def EnableTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_EnableTool,(self,) + _args, _kwargs) + def InsertControl(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def FindToolForPosition(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs) - if val: val = wxToolBarToolPtr(val) + def AddSeparator(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def GetToolSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolSize,(self,) + _args, _kwargs) - if val: val = wxSizePtr(val) ; val.thisown = 1 + def InsertSeparator(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_InsertSeparator,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def GetToolBitmapSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolBitmapSize,(self,) + _args, _kwargs) - if val: val = wxSizePtr(val) ; val.thisown = 1 + def RemoveTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_RemoveTool,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val - def SetToolBitmapSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToolBitmapSize,(self,) + _args, _kwargs) + def DeleteToolByPos(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_DeleteToolByPos,(self,) + _args, _kwargs) return val - def GetToolMargins(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolMargins,(self,) + _args, _kwargs) - if val: val = wxSizePtr(val) ; val.thisown = 1 + def DeleteTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_DeleteTool,(self,) + _args, _kwargs) return val - def GetMaxSize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetMaxSize,(self,) + _args, _kwargs) - if val: val = wxSizePtr(val) ; val.thisown = 1 + def ClearTools(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_ClearTools,(self,) + _args, _kwargs) return val - def GetToolEnabled(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolEnabled,(self,) + _args, _kwargs) + def Realize(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_Realize,(self,) + _args, _kwargs) return val - def GetToolLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolLongHelp,(self,) + _args, _kwargs) + def EnableTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_EnableTool,(self,) + _args, _kwargs) return val - def GetToolPacking(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolPacking,(self,) + _args, _kwargs) + def ToggleTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_ToggleTool,(self,) + _args, _kwargs) return val - def GetToolSeparation(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolSeparation,(self,) + _args, _kwargs) + def SetToggle(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetToggle,(self,) + _args, _kwargs) return val - def GetToolShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolShortHelp,(self,) + _args, _kwargs) + def GetToolClientData(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolClientData,(self,) + _args, _kwargs) + return val + def SetToolClientData(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetToolClientData,(self,) + _args, _kwargs) return val def GetToolState(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetToolState,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_GetToolState,(self,) + _args, _kwargs) return val - def Realize(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_Realize,(self,) + _args, _kwargs) + def GetToolEnabled(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolEnabled,(self,) + _args, _kwargs) + return val + def SetToolShortHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetToolShortHelp,(self,) + _args, _kwargs) + return val + def GetToolShortHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolShortHelp,(self,) + _args, _kwargs) return val def SetToolLongHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToolLongHelp,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_SetToolLongHelp,(self,) + _args, _kwargs) return val - def SetToolShortHelp(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToolShortHelp,(self,) + _args, _kwargs) + def GetToolLongHelp(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolLongHelp,(self,) + _args, _kwargs) + return val + def SetMarginsXY(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetMarginsXY,(self,) + _args, _kwargs) return val def SetMargins(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetMargins,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_SetMargins,(self,) + _args, _kwargs) return val def SetToolPacking(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToolPacking,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_SetToolPacking,(self,) + _args, _kwargs) return val def SetToolSeparation(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToolSeparation,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_SetToolSeparation,(self,) + _args, _kwargs) return val - def ToggleTool(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_ToggleTool,(self,) + _args, _kwargs) + def GetToolMargins(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolMargins,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 return val - def SetToggle(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetToggle,(self,) + _args, _kwargs) + def GetToolPacking(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolPacking,(self,) + _args, _kwargs) + return val + def GetToolSeparation(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolSeparation,(self,) + _args, _kwargs) + return val + def SetRows(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetRows,(self,) + _args, _kwargs) return val def SetMaxRowsCols(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_SetMaxRowsCols,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_SetMaxRowsCols,(self,) + _args, _kwargs) return val def GetMaxRows(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetMaxRows,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_GetMaxRows,(self,) + _args, _kwargs) return val def GetMaxCols(self, *_args, **_kwargs): - val = apply(stattoolc.wxToolBar_GetMaxCols,(self,) + _args, _kwargs) + val = apply(stattoolc.wxToolBarBase_GetMaxCols,(self,) + _args, _kwargs) + return val + def SetToolBitmapSize(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_SetToolBitmapSize,(self,) + _args, _kwargs) + return val + def GetToolBitmapSize(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolBitmapSize,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def GetToolSize(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_GetToolSize,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def __repr__(self): + return "" % (self.this,) +class wxToolBarBase(wxToolBarBasePtr): + def __init__(self,this): + self.this = this + + + + +class wxToolBarPtr(wxToolBarBasePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def FindToolForPosition(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) return val def __repr__(self): return "" % (self.this,) @@ -279,6 +313,25 @@ class wxToolBar(wxToolBarPtr): +class wxToolBarSimplePtr(wxToolBarBasePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def FindToolForPosition(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarSimple_FindToolForPosition,(self,) + _args, _kwargs) + if val: val = wxToolBarToolBasePtr(val) + return val + def __repr__(self): + return "" % (self.this,) +class wxToolBarSimple(wxToolBarSimplePtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(stattoolc.new_wxToolBarSimple,_args,_kwargs) + self.thisown = 1 + wx._StdWindowCallbacks(self) + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -287,3 +340,6 @@ class wxToolBar(wxToolBarPtr): #-------------- VARIABLE WRAPPERS ------------------ +wxTOOL_STYLE_BUTTON = stattoolc.wxTOOL_STYLE_BUTTON +wxTOOL_STYLE_SEPARATOR = stattoolc.wxTOOL_STYLE_SEPARATOR +wxTOOL_STYLE_CONTROL = stattoolc.wxTOOL_STYLE_CONTROL diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp index 1061ce66a6..86cae0dece 100644 --- a/utils/wxPython/src/msw/windows.cpp +++ b/utils/wxPython/src/msw/windows.cpp @@ -8804,7 +8804,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_wxWindowID",0}, { "_class_wxRegion","_wxRegion",0}, { "_class_wxDataFormat","_wxDataFormat",0}, - { "_wxGDIImage","_class_wxGDIImage",0}, { "_wxFont","_class_wxFont",0}, { "_class_wxPyDropTarget","_wxPyDropTarget",0}, { "_unsigned_long","_wxDash",0}, @@ -8880,7 +8879,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0}, { "_class_wxPyDropSource","_wxPyDropSource",0}, { "_class_wxImageList","_wxImageList",0}, - { "_class_wxGDIImage","_wxGDIImage",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_size_t",0}, diff --git a/utils/wxPython/src/msw/windows3.cpp b/utils/wxPython/src/msw/windows3.cpp index 367ddca388..517f79fc59 100644 --- a/utils/wxPython/src/msw/windows3.cpp +++ b/utils/wxPython/src/msw/windows3.cpp @@ -1769,6 +1769,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, { "_wxGrid","_class_wxGrid",0}, { "_wxPen","_class_wxPen",0}, @@ -1872,18 +1873,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, @@ -1930,6 +1932,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, @@ -1971,7 +1974,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -2043,6 +2045,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxIconizeEvent","_class_wxIconizeEvent",0}, { "_class_wxControl","_wxControl",0}, @@ -2103,6 +2106,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, { "_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow}, { "_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow}, diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp index df1fa72d29..6c761f2cf3 100644 --- a/utils/wxPython/src/msw/wx.cpp +++ b/utils/wxPython/src/msw/wx.cpp @@ -1668,6 +1668,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, { "_wxImageHandler","_class_wxImageHandler",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_class_wxTreeCtrl","_wxTreeCtrl",0}, { "_wxMask","_class_wxMask",0}, { "_wxToolTip","_class_wxToolTip",0}, @@ -1697,6 +1698,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxBitmapButton","_class_wxBitmapButton",0}, { "_wxSashWindow","_class_wxSashWindow",0}, { "_class_wxSizer","_wxSizer",0}, + { "_class_wxTIFFHandler","_wxTIFFHandler",0}, { "_class_wxPrintDialogData","_wxPrintDialogData",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_class_wxClipboard","_wxClipboard",0}, @@ -1790,7 +1792,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_wxColourDialog","_class_wxColourDialog",0}, { "_wxPrintData","_class_wxPrintData",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, @@ -1802,12 +1803,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, { "_class_wxBusyCursor","_wxBusyCursor",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, { "_wxListItem","_class_wxListItem",0}, { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, @@ -1860,6 +1863,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, @@ -1904,7 +1908,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, @@ -1988,6 +1991,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxTreeItemId","_wxTreeItemId",0}, { "_wxTreeCtrl","_class_wxTreeCtrl",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, @@ -2019,6 +2023,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSizer","_class_wxSizer",0}, { "_class_wxShowEvent","_wxShowEvent",0}, { "_class_wxPCXHandler","_wxPCXHandler",0}, + { "_wxTIFFHandler","_class_wxTIFFHandler",0}, { "_wxPyDropTarget","_class_wxPyDropTarget",0}, { "_wxActivateEvent","_class_wxActivateEvent",0}, { "_wxGauge","_class_wxGauge",0}, @@ -2060,6 +2065,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0}, { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_class_wxFontDialog","_wxFontDialog",0}, { "_wxWindow","_class_wxWindow",0}, { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, @@ -2322,6 +2328,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY)); PyDict_SetItemString(d,"wxBITMAP_TYPE_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_RESOURCE)); PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG)); + PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX", PyInt_FromLong((long) wxBITMAP_TYPE_PCX)); PyDict_SetItemString(d,"wxOPEN", PyInt_FromLong((long) wxOPEN)); PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE)); PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY)); diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py index 88a0217220..89af171ebb 100644 --- a/utils/wxPython/src/msw/wx.py +++ b/utils/wxPython/src/msw/wx.py @@ -391,6 +391,7 @@ wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE wxBITMAP_TYPE_JPEG = wxc.wxBITMAP_TYPE_JPEG +wxBITMAP_TYPE_PCX = wxc.wxBITMAP_TYPE_PCX wxOPEN = wxc.wxOPEN wxSAVE = wxc.wxSAVE wxHIDE_READONLY = wxc.wxHIDE_READONLY @@ -1486,6 +1487,8 @@ wxPyDefaultSize.Set(-1,-1) wxDefaultPosition = wxPyDefaultPosition wxDefaultSize = wxPyDefaultSize +# backwards compatibility +wxNoRefBitmap = wxBitmap #---------------------------------------------------------------------- # This helper function will take a wxPython object and convert it to @@ -1515,7 +1518,8 @@ def wxPyTypeCast(obj, typeStr): newPtr = ptrcast(obj, typeStr+"_p") theClass = globals()[typeStr+"Ptr"] theObj = theClass(newPtr) - theObj.thisown = obj.thisown + if hasattr(obj, "this"): + theObj.thisown = obj.thisown return theObj @@ -1600,6 +1604,13 @@ class wxApp(wxPyApp): if self.stdioWin != None: self.stdioWin.close() +#---------------------------------------------------------------------------- + +class wxPySimpleApp(wxApp): + def __init__(self): + wxApp.__init__(self, 0) + def OnInit(self): + return true #---------------------------------------------------------------------------- diff --git a/utils/wxPython/src/sizers.i b/utils/wxPython/src/sizers.i index 9aa68950c4..341e1cdb04 100644 --- a/utils/wxPython/src/sizers.i +++ b/utils/wxPython/src/sizers.i @@ -32,20 +32,6 @@ //--------------------------------------------------------------------------- -%{ -class wxPyUserData : public wxObject { -public: - wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); } - ~wxPyUserData() { - bool doSave = wxPyRestoreThread(); - Py_DECREF(m_obj); - wxPySaveThread(doSave); - } - PyObject* m_obj; -}; -%} - -//--------------------------------------------------------------------------- class wxSizerItem { public: @@ -69,6 +55,11 @@ public: int GetFlag(); int GetBorder(); + void SetInitSize( int x, int y ); + void SetOption( int option ); + void SetFlag( int flag ); + void SetBorder( int border ); + // wxObject* GetUserData(); %addmethods { // Assume that the user data is a wxPyUserData object and return the contents diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i index 0867a953bb..c8987504ba 100644 --- a/utils/wxPython/src/stattool.i +++ b/utils/wxPython/src/stattool.i @@ -65,13 +65,250 @@ public: //--------------------------------------------------------------------------- +class wxToolBarBase; + +enum wxToolBarToolStyle +{ + wxTOOL_STYLE_BUTTON = 1, + wxTOOL_STYLE_SEPARATOR = 2, + wxTOOL_STYLE_CONTROL +}; + + + +class wxToolBarToolBase { +public: +// wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL, +// int id = wxID_SEPARATOR, +// const wxBitmap& bitmap1 = wxNullBitmap, +// const wxBitmap& bitmap2 = wxNullBitmap, +// bool toggle = FALSE, +// wxObject *clientData = (wxObject *) NULL, +// const wxString& shortHelpString = wxEmptyString, +// const wxString& longHelpString = wxEmptyString); +// wxToolBarToolBase(wxToolBarBase *tbar, wxControl *control); +// ~wxToolBarToolBase(); + + %addmethods { void Destroy() { delete self; } } + + int GetId(); + wxControl *GetControl(); + wxToolBarBase *GetToolBar(); + int IsButton(); + int IsControl(); + int IsSeparator(); + int GetStyle(); + bool IsEnabled(); + bool IsToggled(); + bool CanBeToggled(); + const wxBitmap& GetBitmap1(); + const wxBitmap& GetBitmap2(); + const wxBitmap& GetBitmap(); + wxString GetShortHelp(); + wxString GetLongHelp(); + bool Enable(bool enable); + bool Toggle(bool toggle); + bool SetToggle(bool toggle); + bool SetShortHelp(const wxString& help); + bool SetLongHelp(const wxString& help); + void SetBitmap1(const wxBitmap& bmp); + void SetBitmap2(const wxBitmap& bmp); + void Detach(); + void Attach(wxToolBarBase *tbar); + + //wxObject *GetClientData(); + %addmethods { + // convert the ClientData back to a PyObject + PyObject* GetClientData() { + wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); + if (udata) { + Py_INCREF(udata->m_obj); + return udata->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } + + void SetClientData(PyObject* clientData) { + self->SetClientData(new wxPyUserData(clientData)); + } + } +}; + + + +class wxToolBarBase : public wxControl { +public: + + // This is an Abstract Base Class + + %addmethods { + // wrap ClientData in a class that knows about PyObjects + wxToolBarToolBase *AddTool(int id, + const wxBitmap& bitmap, + const wxBitmap& pushedBitmap = wxNullBitmap, + int toggle = FALSE, + PyObject *clientData = NULL, + const wxString& shortHelpString = wxPyEmptyStr, + const wxString& longHelpString = wxPyEmptyStr) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->AddTool(id, bitmap, pushedBitmap, (bool)toggle, + udata, shortHelpString, longHelpString); + } + + // This one is easier to use... + wxToolBarToolBase *AddSimpleTool(int id, + const wxBitmap& bitmap, + const wxString& shortHelpString = wxPyEmptyStr, + const wxString& longHelpString = wxPyEmptyStr, + int toggle = FALSE) { + return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL, + shortHelpString, longHelpString); + } + + + // wrap ClientData in a class that knows about PyObjects + wxToolBarToolBase *InsertTool(size_t pos, + int id, + const wxBitmap& bitmap, + const wxBitmap& pushedBitmap = wxNullBitmap, + int toggle = FALSE, + PyObject *clientData = NULL, + const wxString& shortHelpString = wxPyEmptyStr, + const wxString& longHelpString = wxPyEmptyStr) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)toggle, + udata, shortHelpString, longHelpString); + } + + // This one is easier to use... + wxToolBarToolBase *InsertSimpleTool(size_t pos, + int id, + const wxBitmap& bitmap, + const wxString& shortHelpString = wxPyEmptyStr, + const wxString& longHelpString = wxPyEmptyStr, + int toggle = FALSE) { + return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL, + shortHelpString, longHelpString); + } + } + + + wxToolBarToolBase *AddControl(wxControl *control); + wxToolBarToolBase *InsertControl(size_t pos, wxControl *control); + + wxToolBarToolBase *AddSeparator(); + wxToolBarToolBase *InsertSeparator(size_t pos); + + wxToolBarToolBase *RemoveTool(int id); + + bool DeleteToolByPos(size_t pos); + bool DeleteTool(int id); + void ClearTools(); + bool Realize(); + + void EnableTool(int id, bool enable); + void ToggleTool(int id, bool toggle); + void SetToggle(int id, bool toggle); + + + %addmethods { + // convert the ClientData back to a PyObject + PyObject* GetToolClientData(int index) { + wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(index); + if (udata) { + Py_INCREF(udata->m_obj); + return udata->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } + + void SetToolClientData(int index, PyObject* clientData) { + self->SetToolClientData(index, new wxPyUserData(clientData)); + } + } + + + bool GetToolState(int id); + bool GetToolEnabled(int id); + void SetToolShortHelp(int id, const wxString& helpString); + wxString GetToolShortHelp(int id); + void SetToolLongHelp(int id, const wxString& helpString); + wxString GetToolLongHelp(int id); + + %name(SetMarginsXY) void SetMargins(int x, int y); + void SetMargins(const wxSize& size); + void SetToolPacking(int packing); + void SetToolSeparation(int separation); + wxSize GetToolMargins(); + int GetToolPacking(); + int GetToolSeparation(); + + void SetRows(int nRows); + void SetMaxRowsCols(int rows, int cols); + int GetMaxRows(); + int GetMaxCols(); + + void SetToolBitmapSize(const wxSize& size); + wxSize GetToolBitmapSize(); + wxSize GetToolSize(); + +}; + + + + +class wxToolBar : public wxToolBarBase { +public: + wxToolBar(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxPyDefaultPosition, + const wxSize& size = wxPyDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const wxString& name = wxToolBarNameStr); + + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + + wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y); +}; + + + + +class wxToolBarSimple : public wxToolBarBase { +public: + wxToolBarSimple(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxPyDefaultPosition, + const wxSize& size = wxPyDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const wxString& name = wxToolBarNameStr); + + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + + wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y); +}; + +//--------------------------------------------------------------------------- + + + +#ifdef THE_OLD_ONE + class wxToolBarTool { public: wxToolBarTool(); ~wxToolBarTool(); - void SetSize( long w, long h ) { m_width = w; m_height = h; } - long GetWidth () const { return m_width; } - long GetHeight () const { return m_height; } + void SetSize( long w, long h ) + long GetWidth (); + long GetHeight (); wxControl *GetControl(); public: @@ -166,13 +403,14 @@ public: void SetToolPacking(int packing); void SetToolSeparation(int separation); void ToggleTool(int toolIndex, const bool toggle); -#ifdef __WXMSW__ void SetToggle(int toolIndex, bool toggle); void SetMaxRowsCols(int rows, int cols); int GetMaxRows(); int GetMaxCols(); -#endif }; + +#endif + //--------------------------------------------------------------------------- diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index 5bfd5bbd17..f9daf1d009 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -142,9 +142,7 @@ public: wxPyValidator(); // ~wxPyValidator(); - %addmethods { - void Destroy() { delete self; } - } + %addmethods { void Destroy() { delete self; } } void _setSelf(PyObject* self, int incref=TRUE); %pragma(python) addtomethod = "__init__:self._setSelf(self, 0)" -- 2.45.2