From 990416e0bd9fc0eb013165e1d164e8e6df560f32 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 2 Feb 2000 06:37:06 +0000
Subject: [PATCH] minor fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
utils/wxPython/BUILD.txt | 2 +-
utils/wxPython/demo/wxButton.py | 4 +--
utils/wxPython/src/msw/cmndlgs.cpp | 4 +--
utils/wxPython/src/msw/stattool.cpp | 38 +++++------------------------
4 files changed, 11 insertions(+), 37 deletions(-)
diff --git a/utils/wxPython/BUILD.txt b/utils/wxPython/BUILD.txt
index 6d95d40008..df6a119675 100644
--- a/utils/wxPython/BUILD.txt
+++ b/utils/wxPython/BUILD.txt
@@ -37,7 +37,7 @@ below.)
--enable-shared=yes
--disable-std_iostreams
- You can use whatever flags you want, but these work for me. be
+ You can use whatever flags you want, but these work for me. Be
sure to run "make install" to install the wxWindows headers and
shared library. You can check where the wxPython build will expect
to find them by running "wx-config --cflags" and "wx-config --libs"
diff --git a/utils/wxPython/demo/wxButton.py b/utils/wxPython/demo/wxButton.py
index 758c8907df..d5ccab8493 100644
--- a/utils/wxPython/demo/wxButton.py
+++ b/utils/wxPython/demo/wxButton.py
@@ -19,8 +19,8 @@ class TestPanel(wxPanel):
bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
# the mask is still having troubles on win95/98...
- #mask = wxMaskColour(bmp, wxBLUE)
- #bmp.SetMask(mask)
+ mask = wxMaskColour(bmp, wxBLUE)
+ bmp.SetMask(mask)
wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index 95122f36d4..f39258cd2b 100644
--- a/utils/wxPython/src/msw/cmndlgs.cpp
+++ b/utils/wxPython/src/msw/cmndlgs.cpp
@@ -2254,14 +2254,14 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject
PyObject * _resultobj;
wxFontDialog * _result;
wxWindow * _arg0;
- wxFontData * _arg1 = (wxFontData *) NULL;
+ wxFontData * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "parent","data", NULL };
char _ptemp[128];
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxFontDialog",_kwnames,&_argo0,&_argo1))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:new_wxFontDialog",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index 2273936879..9192ba9ded 100644
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -2839,18 +2839,17 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
- wxString * _arg5 = (wxString *) &wxToolBarNameStr;
+ char * _arg5 = (char *) wxToolBarNameStr;
PyObject * _argo0 = 0;
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,"Oi|OOlO:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2870,18 +2869,10 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
_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 = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5);
+ _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
} if (_result) {
@@ -2891,10 +2882,6 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
Py_INCREF(Py_None);
_resultobj = Py_None;
}
-{
- if (_obj5)
- delete _arg5;
-}
return _resultobj;
}
@@ -2975,18 +2962,17 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
- wxString * _arg5 = (wxString *) &wxToolBarNameStr;
+ char * _arg5 = (char *) wxToolBarNameStr;
PyObject * _argo0 = 0;
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,"Oi|OOlO:new_wxToolBarSimple",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBarSimple",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3006,18 +2992,10 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
_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 = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5);
+ _result = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
} if (_result) {
@@ -3027,10 +3005,6 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
Py_INCREF(Py_None);
_resultobj = Py_None;
}
-{
- if (_obj5)
- delete _arg5;
-}
return _resultobj;
}
--
2.47.2