minor updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/README.txt b/wxPython/README.txt
index 9e32c5f3153a3e440f484666ddd4f700828c4382..278202e0f8bd53723fdd41055d060ceb9fe47cfd 100644 (file)
--- a/wxPython/README.txt
+++ b/wxPython/README.txt
@@ -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.
 
 

diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/wxButton.py
index a02cc6f5ab422f420d842b9591fbebb335017307..2a92effc126f4a33d4abbfdc6efc090c4c39228d 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -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))

diff --git a/wxPython/demo/wxDirDialog.py b/wxPython/demo/wxDirDialog.py
index bbed89b9d8207152e02fb6e114b0da0a64f35c5d..cfb935d9b9a577eb37996afb0fbf008b697fa529 100644 (file)
--- a/wxPython/demo/wxDirDialog.py
+++ b/wxPython/demo/wxDirDialog.py
@@ -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.
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-pos = Dialog position.
-"""

diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index bdafa03d36a19cbee616cafa9c677636e0108037..2c865f7416fda5f50b019239f59150153732755a 100644 (file)
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -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]

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index a2ab5548f15b5789743173fd4780fbafa95d8791..cc2484f9d7626dea33dde321fb221144f51266a0 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -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)

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 1714cc46a4334731e6b380dcbb1257b2f695fb9b..c384c2038f5c63f06205b771efc97616f43dd526 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -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>"

diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index c4e95756e02b99111f2c08be0c3053ea14ab653c..f55cc1e507e63e8b2236858afc8a157946563c28 100644 (file)
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.3.3pre3'
+ver = '2.3.3pre4'

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 8cbfd8782e1cddca8613c515a8949c219f2dd4f2..1acff88052518bed8a4f1cfedd90bb571b51ad6f 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -515,6 +515,8 @@ enum {
     wxMM_POINTS,
     wxMM_METRIC,
 
+    wxTIMER_CONTINUOUS,
+    wxTIMER_ONE_SHOT,
 };
 
 

diff --git a/wxPython/src/msw/stattool.cpp b/wxPython/src/msw/stattool.cpp
index f613ad6a77852590384272faa4b97ce78875d611..1f0fb29eaf657664f7995d59f96cf045e02955bd 100644 (file)
--- a/wxPython/src/msw/stattool.cpp
+++ b/wxPython/src/msw/stattool.cpp
@@ -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 },

diff --git a/wxPython/src/msw/stattool.py b/wxPython/src/msw/stattool.py
index c366b640a1de30eb8fff804076f97ec0310407fe..cea709ed3e143a2b2a1f047af1b940f29d92337f 100644 (file)
--- a/wxPython/src/msw/stattool.py
+++ b/wxPython/src/msw/stattool.py
@@ -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

diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp
index f422bc5d1d288d632f16141adcb6955037972f57..a67fca1c0281301bfeb36bee4d7047d9f73eb196 100644 (file)
--- a/wxPython/src/msw/wx.cpp
+++ b/wxPython/src/msw/wx.cpp
@@ -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));

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 0eb6913050baa6a3f149024239e50c4b0b86ee00..ae2194e9f7907a3f8af6b622b1fb2d8057777db3 100644 (file)
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -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

diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i
index 4b8a73cb11f3b2434ab343103b8617fc3c00c7ae..84b81d7d4f073171ecfe5d6490fab2d98c0af3e9 100644 (file)
--- a/wxPython/src/stattool.i
+++ b/wxPython/src/stattool.i
@@ -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);

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index e7bb17b37a8cb185db80469286ffd62c62af5ef3..d4a129b90c6a6e52f8ac2f710aac1b86047e3dae 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -272,4 +272,3 @@ static wxPyCoreAPI API = {
 
 %pragma(python) include="_extras.py";
 
-