X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc2360764db645fce217e71190f723189495a0ea..32485259c1342115488d219776dfebeb3d4d81b1:/wxPython/src/_artprov.i diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i index 72ef9ddd7d..add7ff93d5 100644 --- a/wxPython/src/_artprov.i +++ b/wxPython/src/_artprov.i @@ -76,6 +76,7 @@ MAKE_CONST_WXSTRING(ART_COPY); MAKE_CONST_WXSTRING(ART_CUT); MAKE_CONST_WXSTRING(ART_PASTE); MAKE_CONST_WXSTRING(ART_DELETE); +MAKE_CONST_WXSTRING(ART_NEW); MAKE_CONST_WXSTRING(ART_UNDO); MAKE_CONST_WXSTRING(ART_REDO); MAKE_CONST_WXSTRING(ART_QUIT); @@ -92,7 +93,7 @@ public: const wxArtClient& client, const wxSize& size) { wxBitmap rval = wxNullBitmap; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) { PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0); PyObject* ro; @@ -160,7 +161,6 @@ follow the freedesktop.org Icon Themes specification. Note that themes are not guaranteed to contain all icons, so wx.ArtProvider may return wx.NullBitmap or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hicolor. - * wx.ART_ADD_BOOKMARK * wx.ART_DEL_BOOKMARK * wx.ART_HELP_SIDE_PANEL @@ -175,13 +175,20 @@ or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hi * wx.ART_GO_TO_PARENT * wx.ART_GO_HOME * wx.ART_FILE_OPEN + * wx.ART_FILE_SAVE + * wx.ART_FILE_SAVE_AS * wx.ART_PRINT * wx.ART_HELP * wx.ART_TIP * wx.ART_REPORT_VIEW * wx.ART_LIST_VIEW * wx.ART_NEW_DIR + * wx.ART_HARDDISK + * wx.ART_FLOPPY + * wx.ART_CDROM + * wx.ART_REMOVABLE * wx.ART_FOLDER + * wx.ART_FOLDER_OPEN * wx.ART_GO_DIR_UP * wx.ART_EXECUTABLE_FILE * wx.ART_NORMAL_FILE @@ -191,7 +198,17 @@ or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hi * wx.ART_QUESTION * wx.ART_WARNING * wx.ART_INFORMATION - * wx.ART_MISSING_IMAGE + * wx.ART_MISSING_IMAGE + * wx.ART_COPY + * wx.ART_CUT + * wx.ART_PASTE + * wx.ART_DELETE + * wx.ART_NEW + * wx.ART_UNDO + * wx.ART_REDO + * wx.ART_QUIT + * wx.ART_FIND + * wx.ART_FIND_AND_REPLACE Clients @@ -263,8 +280,8 @@ wx.NullBitmap if no provider provides it.", ""); wx.NullIcon if no provider provides it.", ""); DocDeclStr( - static wxSize , GetSize(const wxString& client, bool platform_dependent = false), - "Get the size of an icon from a specific Art Client, queries the + static wxSize , GetSizeHint(const wxString& client, bool platform_dependent = false), + "Get the size hint of an icon from a specific Art Client, queries the topmost provider if platform_dependent = false", "");