diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h --- wxGTK-2.4.1/include/wx/chkconf.h 2003-06-08 09:13:10.000000000 +0100 +++ wxGTK-2.4.1/include/wx/chkconf.h 2003-06-16 21:46:45.000000000 +0100 @@ -772,6 +772,17 @@ # endif #endif /* wxUSE_FILESYSTEM */ +#if wxUSE_FS_INET +# if !wxUSE_PROTOCOL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_FS_INET requires wxUSE_PROTOCOL" +# else +# undef wxUSE_PROTOCOL +# define wxUSE_PROTOCOL 1 +# endif +# endif +#endif /* wxUSE_FS_INET */ + #if wxUSE_STOPWATCH || wxUSE_DATETIME # if !wxUSE_LONGLONG # ifdef wxABORT_ON_CONFIG_ERROR diff -ur wx/menuitem.h ../../wxPythonSrc-2.4.1.2/include/wx/menuitem.h --- wxGTK-2.4.1/include/wx/menuitem.h 2003-06-08 09:13:11.000000000 +0100 +++ wxGTK-2.4.1/include/wx/menuitem.h 2003-06-11 00:48:45.000000000 +0100 @@ -49,6 +49,7 @@ // the menu we're in wxMenu *GetMenu() const { return m_parentMenu; } + void SetMenu(wxMenu* menu) { m_parentMenu = menu; } // get/set id void SetId(int id) { m_id = id; }