@@ -13,7 +13,7 @@ wxpy_modules = [ ('_wxcore', ['src/wx.sip'] + wxpy_extra_sources), # TODO: use wxUSE_XXX flags - ('_wxhtml', ['src/html.sip']), +# ('_wxhtml', ['src/html.sip']), ('_wxcalendar', ['src/calendar.sip']), # ('_wxcombo', ['src/combo.sip']), ('_wxstc', ['contrib/stc/stc.sip']), setup.py @@ -317,6 +317,9 @@ public: const wxString& GetName() const; }; + + +/* enum { wxCONVERT_STRICT, @@ -333,6 +336,7 @@ enum wxPLATFORM_OS2, wxPLATFORM_MAC }; +*/ wxString wxGetTranslation(const wxString& str); wxString wxGetTranslation(const wxString& str, const wxString& domain); src/intl.sip @@ -8,6 +8,9 @@ import os.path, sys VERSION = (2, 8, 7, 1) +# TODO: make configurable at build time +USE_HTML = 0 + # make sure "wx" is on the syspath _wxpy_dir = os.path.split(os.path.abspath(__file__))[0] sys.path.append(_wxpy_dir) @@ -710,11 +713,12 @@ def _wxpy_init(clearSigInt=True): except Exception: pass - try: - # make sure HTML tag modules get loaded - import lib.wxpTag - except Exception: - from traceback import print_exc; print_exc() + if USE_HTML: + try: + # make sure HTML tag modules get loaded + import lib.wxpTag + except Exception: + from traceback import print_exc; print_exc() _entrystart() _initallimagehandlers() wx/__init__.py @@ -77,7 +77,7 @@ <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> <wx-lib>adv</wx-lib> - <wx-lib>html</wx-lib> + <!--<wx-lib>html</wx-lib>--> <wx-lib>stc</wx-lib> <if cond="PLATFORM_WIN32=='1'"> wxpybuild/wxpy-settings.bkl 86ecd5cd4ecf6a975ed76153862df372cd53c9d3 Kevin Watters kevinwatters@gmail.com http://github.com/kevinw/wxpy/commit/aae7b37675f6a04c27f8cea3de4448c6589fdc85 aae7b37675f6a04c27f8cea3de4448c6589fdc85 2009-05-05T14:19:13-07:00 2009-05-05T14:19:13-07:00 Remove wx.html. Needs to be configurable at build time. b15d2820ab57383c1868aa4955e3da5766802a57 Kevin Watters kevinwatters@gmail.com