AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2002-06-05 16:45:04 +00:00
parent 90a6f1cca8
commit fe953afb43
14 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/README.txt
View File

@ -70,6 +70,8 @@ Please also see the following files in this directory:
BUILD.win32.txt Instructions for building wxPython on Windows.
BUILD.osx.txt Instructions for building wxPython on Mac OS X.
licence/* Text of the wxWindows license.

3
wxPython/demo/wxButton.py
View File

@ -7,7 +7,8 @@ import images
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
wxPanel.__init__(self, parent, -1,
style=wxNO_FULL_REPAINT_ON_RESIZE)
self.log = log
b = wxButton(self, 10, "Hello", wxPoint(20, 20))

43
wxPython/demo/wxDirDialog.py
View File

@ -4,7 +4,8 @@ from wxPython.wx import *
#---------------------------------------------------------------------------
def runTest(frame, nb, log):
dlg = wxDirDialog(frame, "Choose a directory:")
dlg = wxDirDialog(frame, "Choose a directory:",
style=wxDD_DEFAULT_STYLE|wxDD_NEW_DIR_BUTTON)
if dlg.ShowModal() == wxID_OK:
log.WriteText('You selected: %s\n' % dlg.GetPath())
dlg.Destroy()
@ -15,39 +16,13 @@ def runTest(frame, nb, log):
overview = """\
This class represents the directory chooser dialog.
wxDirDialog()
------------------------
wxDirDialog(wxWindow* parent, const wxString& message = "Choose a directory", const wxString& defaultPath = "", long style = 0, const wxPoint& pos = wxDefaultPosition)
Constructor. Use wxDirDialog::ShowModal to show the dialog.
Parameters
-------------------
parent = Parent window.
message = Message to show on the dialog.
defaultPath = The default path, or the empty string.
style = A dialog style, currently unused.
pos = Dialog position.
"""
if __name__ == '__main__':
import sys,os
import run
run.main(['', os.path.basename(sys.argv[0])])

4
wxPython/demo/wxHtmlWindow.py
View File

@ -13,7 +13,7 @@ from Main import opj
# method in the C++ code...)
class MyHtmlWindow(wxHtmlWindow):
def __init__(self, parent, id, log):
wxHtmlWindow.__init__(self, parent, id)
wxHtmlWindow.__init__(self, parent, id, style=wxNO_FULL_REPAINT_ON_RESIZE)
self.log = log
EVT_SCROLLWIN( self, self.OnScroll )
@ -45,7 +45,7 @@ class MyHtmlWindow(wxHtmlWindow):
class TestHtmlPanel(wxPanel):
def __init__(self, parent, frame, log):
wxPanel.__init__(self, parent, -1)
wxPanel.__init__(self, parent, -1, style=wxNO_FULL_REPAINT_ON_RESIZE)
self.log = log
self.frame = frame
self.cwd = os.path.split(sys.argv[0])[0]

9
wxPython/demo/wxStyledTextCtrl_2.py
View File

@ -29,8 +29,8 @@ else:
'mono' : 'Courier',
'helv' : 'Helvetica',
'other': 'new century schoolbook',
'size' : 13,
'size2': 11,
'size' : 10,
'size2': 18,
}
@ -38,7 +38,8 @@ else:
class PythonSTC(wxStyledTextCtrl):
def __init__(self, parent, ID):
wxStyledTextCtrl.__init__(self, parent, ID)
wxStyledTextCtrl.__init__(self, parent, ID,
style = wxNO_FULL_REPAINT_ON_RESIZE)
self.CmdKeyAssign(ord('B'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMIN)
self.CmdKeyAssign(ord('N'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMOUT)
@ -300,7 +301,7 @@ def runTest(frame, nb, log):
if not _USE_PANEL:
ed = p = PythonSTC(nb, -1)
else:
p = wxPanel(nb, -1)
p = wxPanel(nb, -1, style = wxNO_FULL_REPAINT_ON_RESIZE)
ed = PythonSTC(p, -1)
s = wxBoxSizer(wxHORIZONTAL)
s.Add(ed, 1, wxEXPAND)

2
wxPython/setup.py
View File

@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
# flags and values that affect this script
#----------------------------------------------------------------------
VERSION = "2.3.3pre3"
VERSION = "2.3.3pre4"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"

2
wxPython/src/__version__.py
View File

@ -1 +1 @@
ver = '2.3.3pre3'
ver = '2.3.3pre4'

2
wxPython/src/_defs.i
View File

@ -515,6 +515,8 @@ enum {
wxMM_POINTS,
wxMM_METRIC,
wxTIMER_CONTINUOUS,
wxTIMER_ONE_SHOT,
};

30
wxPython/src/msw/stattool.cpp
View File

@ -1896,6 +1896,35 @@ static PyObject *_wrap_wxToolBarBase_InsertControl(PyObject *self, PyObject *arg
return _resultobj;
}
#define wxToolBarBase_FindControl(_swigobj,_swigarg0) (_swigobj->FindControl(_swigarg0))
static PyObject *_wrap_wxToolBarBase_FindControl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxControl * _result;
wxToolBarBase * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","id", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_FindControl",_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_FindControl. Expected _wxToolBarBase_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxControl *)wxToolBarBase_FindControl(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
#define wxToolBarBase_AddSeparator(_swigobj) (_swigobj->AddSeparator())
static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@ -3499,6 +3528,7 @@ static PyMethodDef stattoolcMethods[] = {
{ "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_FindControl", (PyCFunction) _wrap_wxToolBarBase_FindControl, 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_InsertTool", (PyCFunction) _wrap_wxToolBarBase_InsertTool, METH_VARARGS | METH_KEYWORDS },

3
wxPython/src/msw/stattool.py
View File

@ -202,6 +202,9 @@ class wxToolBarBasePtr(wxControlPtr):
def InsertControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs)
return val
def FindControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_FindControl,(self,) + _args, _kwargs)
return val
def AddSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs)
return val

2
wxPython/src/msw/wx.cpp
View File

@ -2182,6 +2182,8 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxMM_ANISOTROPIC", PyInt_FromLong((long) wxMM_ANISOTROPIC));
PyDict_SetItemString(d,"wxMM_POINTS", PyInt_FromLong((long) wxMM_POINTS));
PyDict_SetItemString(d,"wxMM_METRIC", PyInt_FromLong((long) wxMM_METRIC));
PyDict_SetItemString(d,"wxTIMER_CONTINUOUS", PyInt_FromLong((long) wxTIMER_CONTINUOUS));
PyDict_SetItemString(d,"wxTIMER_ONE_SHOT", PyInt_FromLong((long) wxTIMER_ONE_SHOT));
PyDict_SetItemString(d,"wxBORDER_DEFAULT", PyInt_FromLong((long) wxBORDER_DEFAULT));
PyDict_SetItemString(d,"wxBORDER_NONE", PyInt_FromLong((long) wxBORDER_NONE));
PyDict_SetItemString(d,"wxBORDER_STATIC", PyInt_FromLong((long) wxBORDER_STATIC));

2
wxPython/src/msw/wx.py
View File

@ -467,6 +467,8 @@ wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
wxMM_POINTS = wxc.wxMM_POINTS
wxMM_METRIC = wxc.wxMM_METRIC
wxTIMER_CONTINUOUS = wxc.wxTIMER_CONTINUOUS
wxTIMER_ONE_SHOT = wxc.wxTIMER_ONE_SHOT
wxBORDER_DEFAULT = wxc.wxBORDER_DEFAULT
wxBORDER_NONE = wxc.wxBORDER_NONE
wxBORDER_STATIC = wxc.wxBORDER_STATIC

1
wxPython/src/stattool.i
View File

@ -344,6 +344,7 @@ public:
wxToolBarToolBase *AddControl(wxControl *control);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
wxControl *FindControl( int id );
wxToolBarToolBase *AddSeparator();
wxToolBarToolBase *InsertSeparator(size_t pos);

1
wxPython/src/wx.i
View File

@ -272,4 +272,3 @@ static wxPyCoreAPI API = {
%pragma(python) include="_extras.py";