Minor tweaks and some typos fixed

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

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index aeaed635aeabf36d724f1c66b4f7082f07a5e8f8..91369950d2f4dffc75f3e0d636a19044c0ad7e56 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -155,7 +155,7 @@ public:
                    const wxDateTime& date = wxDefaultDateTime,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxCAL_SHOW_HOLIDAYS,
+                   long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,
                    const char* name = "calendar");
     %name(wxPreCalendarCtrl)wxCalendarCtrl();
 
@@ -164,7 +164,7 @@ public:
                 const wxDateTime& date = wxDefaultDateTime,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxCAL_SHOW_HOLIDAYS,
+                long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,
                 const char* name = "calendar");
 
     // set/get the current date

diff --git a/wxPython/src/msw/calendar.cpp b/wxPython/src/msw/calendar.cpp
index fa7dbdf2226b4cb74f058e2a1dfb4aa2ffcea776..2afd6292b4ba34888ad46a8f61d136a67afcf888 100644 (file)
--- a/wxPython/src/msw/calendar.cpp
+++ b/wxPython/src/msw/calendar.cpp
@@ -901,7 +901,7 @@ static PyObject *_wrap_new_wxCalendarCtrl(PyObject *self, PyObject *args, PyObje
     wxDateTime * _arg2 = (wxDateTime *) &wxDefaultDateTime;
     wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg4 = (wxSize *) &wxDefaultSize;
-    long  _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS);
+    long  _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS;
     char * _arg6 = (char *) "calendar";
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
@@ -993,7 +993,7 @@ static PyObject *_wrap_wxCalendarCtrl_Create(PyObject *self, PyObject *args, PyO
     wxDateTime * _arg3 = (wxDateTime *) &wxDefaultDateTime;
     wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg5 = (wxSize *) &wxDefaultSize;
-    long  _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS);
+    long  _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS;
     char * _arg7 = (char *) "calendar";
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

diff --git a/wxPython/tools/img2py.py b/wxPython/tools/img2py.py
index 6af6409fa22d0bd4e61d7aa3cee8190a2f6ad6c1..4b9204123fedb2ff87fb7599601276f353128d7e 100644 (file)
--- a/wxPython/tools/img2py.py
+++ b/wxPython/tools/img2py.py
@@ -38,7 +38,7 @@ import img2xpm
 
 
 def crunch_data(data, compressed):
-    # convert the lines to a Python list, pickle it and compress the result.
+    # convert the lines to a Python list, pickle it and optionally compress the result.
     lines = []
     for line in data:
         if line[0] == "\"":

diff --git a/wxPython/wxPython/lib/infoframe.py b/wxPython/wxPython/lib/infoframe.py
index 77b9b00cc1981b07dd1b331207b606539a7c3d6e..dd898c57a013d023e8c883d019eca2fe9924bc58 100644 (file)
--- a/wxPython/wxPython/lib/infoframe.py
+++ b/wxPython/wxPython/lib/infoframe.py
@@ -29,7 +29,7 @@ then), it's "frame" attribute is the actual instance of wFrame...
 Typical usage:
     from wxPython.lib.infoframe import *
     ... # ... modify your wxApp as follows:
-    class myApp[wxApp):
+    class myApp(wxApp):
         outputWindowClass = wxPyInformationalMessagesFrame
         ...
 If you're running on Linux, you'll also have to supply an argument 1 to your