From bae170097ee7527f2077bcd6549f0b5bc41bd652 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 3 Oct 2001 14:52:20 +0000 Subject: [PATCH] Minor tweaks and some typos fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/calendar.i | 4 ++-- wxPython/src/msw/calendar.cpp | 4 ++-- wxPython/tools/img2py.py | 2 +- wxPython/wxPython/lib/infoframe.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i index aeaed635ae..91369950d2 100644 --- 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 fa7dbdf222..2afd6292b4 100644 --- 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 6af6409fa2..4b9204123f 100644 --- 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 77b9b00cc1..dd898c57a0 100644 --- 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 -- 2.45.2