X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f2efe791cf99c2e4944cd615f02a5502ed93e..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/_artprov.i?ds=sidebyside diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i index 70f1de40a9..3213543a55 100644 --- a/wxPython/src/_artprov.i +++ b/wxPython/src/_artprov.i @@ -30,6 +30,7 @@ MAKE_CONST_WXSTRING(ART_FRAME_ICON); MAKE_CONST_WXSTRING(ART_CMN_DIALOG); MAKE_CONST_WXSTRING(ART_HELP_BROWSER); MAKE_CONST_WXSTRING(ART_MESSAGE_BOX); +MAKE_CONST_WXSTRING(ART_BUTTON); MAKE_CONST_WXSTRING(ART_OTHER); // Art IDs @@ -47,13 +48,20 @@ MAKE_CONST_WXSTRING(ART_GO_DOWN); MAKE_CONST_WXSTRING(ART_GO_TO_PARENT); MAKE_CONST_WXSTRING(ART_GO_HOME); MAKE_CONST_WXSTRING(ART_FILE_OPEN); +MAKE_CONST_WXSTRING(ART_FILE_SAVE); +MAKE_CONST_WXSTRING(ART_FILE_SAVE_AS); MAKE_CONST_WXSTRING(ART_PRINT); MAKE_CONST_WXSTRING(ART_HELP); MAKE_CONST_WXSTRING(ART_TIP); MAKE_CONST_WXSTRING(ART_REPORT_VIEW); MAKE_CONST_WXSTRING(ART_LIST_VIEW); MAKE_CONST_WXSTRING(ART_NEW_DIR); +MAKE_CONST_WXSTRING(ART_HARDDISK); +MAKE_CONST_WXSTRING(ART_FLOPPY); +MAKE_CONST_WXSTRING(ART_CDROM); +MAKE_CONST_WXSTRING(ART_REMOVABLE); MAKE_CONST_WXSTRING(ART_FOLDER); +MAKE_CONST_WXSTRING(ART_FOLDER_OPEN); MAKE_CONST_WXSTRING(ART_GO_DIR_UP); MAKE_CONST_WXSTRING(ART_EXECUTABLE_FILE); MAKE_CONST_WXSTRING(ART_NORMAL_FILE); @@ -64,6 +72,16 @@ MAKE_CONST_WXSTRING(ART_QUESTION); MAKE_CONST_WXSTRING(ART_WARNING); MAKE_CONST_WXSTRING(ART_INFORMATION); MAKE_CONST_WXSTRING(ART_MISSING_IMAGE); +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); +MAKE_CONST_WXSTRING(ART_FIND); +MAKE_CONST_WXSTRING(ART_FIND_AND_REPLACE); //--------------------------------------------------------------------------- @@ -75,7 +93,7 @@ public: const wxArtClient& client, const wxSize& size) { wxBitmap rval = wxNullBitmap; - wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) { PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0); PyObject* ro; @@ -93,7 +111,7 @@ public: Py_DECREF(ro); } } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return rval; } @@ -102,38 +120,187 @@ public: %} // The one for SWIG to see -%name(ArtProvider) class wxPyArtProvider /*: public wxObject*/ + + + +DocStr(wxPyArtProvider, +"The wx.ArtProvider class is used to customize the look of wxWidgets +application. When wxWidgets needs to display an icon or a bitmap (e.g. +in the standard file dialog), it does not use hard-coded resource but +asks wx.ArtProvider for it instead. This way the users can plug in +their own wx.ArtProvider class and easily replace standard art with +his/her own version. It is easy thing to do: all that is needed is +to derive a class from wx.ArtProvider, override it's CreateBitmap +method and register the provider with `wx.ArtProvider.Push`:: + + class MyArtProvider(wx.ArtProvider): + def __init__(self): + wx.ArtProvider.__init__(self) + + def CreateBitmap(self, artid, client, size): + ... + return bmp +", " + +Identifying art resources +------------------------- + +Every bitmap is known to wx.ArtProvider under an unique ID that is +used when requesting a resource from it. The IDs can have one of the +following predefined values. Additionally, any string recognized by +custom art providers registered using `Push` may be used. + +GTK+ Note +--------- + +When running under GTK+ 2, GTK+ stock item IDs (e.g. 'gtk-cdrom') may be used +as well. Additionally, if wxGTK was compiled against GTK+ >= 2.4, then it is +also possible to load icons from current icon theme by specifying their name +without the extension and directory components. Icon themes recognized by GTK+ +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 + * wx.ART_HELP_SETTINGS + * wx.ART_HELP_BOOK + * wx.ART_HELP_FOLDER + * wx.ART_HELP_PAGE + * wx.ART_GO_BACK + * wx.ART_GO_FORWARD + * wx.ART_GO_UP + * wx.ART_GO_DOWN + * 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 + * wx.ART_TICK_MARK + * wx.ART_CROSS_MARK + * wx.ART_ERROR + * wx.ART_QUESTION + * wx.ART_WARNING + * wx.ART_INFORMATION + * 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 +------- + +The Client is the entity that calls wx.ArtProvider's `GetBitmap` or +`GetIcon` function. Client IDs serve as a hint to wx.ArtProvider +that is supposed to help it to choose the best looking bitmap. For +example it is often desirable to use slightly different icons in menus +and toolbars even though they represent the same action (e.g. +wx.ART_FILE_OPEN). Remember that this is really only a hint for +wx.ArtProvider -- it is common that `wx.ArtProvider.GetBitmap` returns +identical bitmap for different client values! + + * wx.ART_TOOLBAR + * wx.ART_MENU + * wx.ART_FRAME_ICON + * wx.ART_CMN_DIALOG + * wx.ART_HELP_BROWSER + * wx.ART_MESSAGE_BOX + * wx.ART_BUTTON + * wx.ART_OTHER (used for all requests that don't fit into any + of the categories above) +"); + +MustHaveApp(wxPyArtProvider); +MustHaveApp(wxPyArtProvider::GetBitmap); +MustHaveApp(wxPyArtProvider::GetIcon); + +%rename(ArtProvider) wxPyArtProvider; +class wxPyArtProvider /*: public wxObject*/ { public: - %addtofunc wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)" + %pythonAppend wxPyArtProvider setCallbackInfo(ArtProvider); wxPyArtProvider(); -// ~wxPyArtProvider(); + ~wxPyArtProvider(); void _setCallbackInfo(PyObject* self, PyObject* _class); - // Add new provider to the top of providers stack. - static void PushProvider(wxPyArtProvider *provider); + %disownarg( wxPyArtProvider *provider ); + + DocDeclStr( + static void , Push(wxPyArtProvider *provider), + "Add new provider to the top of providers stack.", ""); + %pythoncode { PushProvider = Push } + + DocDeclStr( + static void , Insert(wxPyArtProvider *provider), + "Add new provider to the bottom of providers stack.", ""); + %pythoncode { InsertProvider = Insert } + + %cleardisown( wxPyArtProvider *provider ); + - // Remove latest added provider and delete it. - static bool PopProvider(); + DocDeclStr( + static bool , Pop(), + "Remove latest added provider and delete it.", ""); + %pythoncode { PopProvider = Pop } + + %pythonAppend Delete "args[1].thisown = 1"; + DocDeclStr( + static bool , Delete(wxPyArtProvider *provider), + "Remove provider. The provider must have been added previously! The +provider is _not_ deleted.", ""); + %pythoncode { RemoveProvider = Delete } - // Remove provider. The provider must have been added previously! - // The provider is _not_ deleted. - static bool RemoveProvider(wxPyArtProvider *provider); - // Query the providers for bitmap with given ID and return it. Return - // wxNullBitmap if no provider provides it. - static wxBitmap GetBitmap(const wxString& id, - const wxString& client = wxPyART_OTHER, - const wxSize& size = wxDefaultSize); + DocDeclStr( + static wxBitmap , GetBitmap(const wxString& id, + const wxString& client = wxPyART_OTHER, + const wxSize& size = wxDefaultSize), + "Query the providers for bitmap with given ID and return it. Return +wx.NullBitmap if no provider provides it.", ""); + - // Query the providers for icon with given ID and return it. Return - // wxNullIcon if no provider provides it. - static wxIcon GetIcon(const wxString& id, + DocDeclStr( + static wxIcon , GetIcon(const wxString& id, const wxString& client = wxPyART_OTHER, - const wxSize& size = wxDefaultSize); + const wxSize& size = wxDefaultSize), + "Query the providers for icon with given ID and return it. Return +wx.NullIcon if no provider provides it.", ""); + + DocDeclStr( + 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", ""); + + + %pythonPrepend Destroy "args[0].this.own(False)" + %extend { void Destroy() { delete self; }} };