X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409ded0fc503ecaae0ac0a834096cfbb55c50056..6580df1b72539453610530247a0b3bea8dad172a:/include/wx/artprov.h diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 1b1fb6d15d..184a21791f 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: artprov.h +// Name: wx/artprov.h // Purpose: wxArtProvider class // Author: Vaclav Slavik // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_ARTPROV_H_ #define _WX_ARTPROV_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "artprov.h" -#endif - #include "wx/string.h" #include "wx/bitmap.h" #include "wx/icon.h" @@ -69,13 +65,20 @@ typedef wxString wxArtID; #define wxART_GO_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT) #define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME) #define wxART_FILE_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN) +#define wxART_FILE_SAVE wxART_MAKE_ART_ID(wxART_FILE_SAVE) +#define wxART_FILE_SAVE_AS wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS) #define wxART_PRINT wxART_MAKE_ART_ID(wxART_PRINT) #define wxART_HELP wxART_MAKE_ART_ID(wxART_HELP) #define wxART_TIP wxART_MAKE_ART_ID(wxART_TIP) #define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW) #define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_VIEW) #define wxART_NEW_DIR wxART_MAKE_ART_ID(wxART_NEW_DIR) +#define wxART_HARDDISK wxART_MAKE_ART_ID(wxART_HARDDISK) +#define wxART_FLOPPY wxART_MAKE_ART_ID(wxART_FLOPPY) +#define wxART_CDROM wxART_MAKE_ART_ID(wxART_CDROM) +#define wxART_REMOVABLE wxART_MAKE_ART_ID(wxART_REMOVABLE) #define wxART_FOLDER wxART_MAKE_ART_ID(wxART_FOLDER) +#define wxART_FOLDER_OPEN wxART_MAKE_ART_ID(wxART_FOLDER_OPEN) #define wxART_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP) #define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE) #define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE) @@ -87,6 +90,21 @@ typedef wxString wxArtID; #define wxART_INFORMATION wxART_MAKE_ART_ID(wxART_INFORMATION) #define wxART_MISSING_IMAGE wxART_MAKE_ART_ID(wxART_MISSING_IMAGE) +#define wxART_COPY wxART_MAKE_ART_ID(wxART_COPY) +#define wxART_CUT wxART_MAKE_ART_ID(wxART_CUT) +#define wxART_PASTE wxART_MAKE_ART_ID(wxART_PASTE) +#define wxART_DELETE wxART_MAKE_ART_ID(wxART_DELETE) +#define wxART_NEW wxART_MAKE_ART_ID(wxART_NEW) + +#define wxART_UNDO wxART_MAKE_ART_ID(wxART_UNDO) +#define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) + +#define wxART_QUIT wxART_MAKE_ART_ID(wxART_QUIT) + +#define wxART_FIND wxART_MAKE_ART_ID(wxART_FIND) +#define wxART_FIND_AND_REPLACE wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE) + + // ---------------------------------------------------------------------------- // wxArtProvider class // ---------------------------------------------------------------------------- @@ -94,15 +112,27 @@ typedef wxString wxArtID; class WXDLLEXPORT wxArtProvider : public wxObject { public: - // Add new provider to the top of providers stack. - static void PushProvider(wxArtProvider *provider); + // Dtor removes the provider from providers stack if it's still on it + virtual ~wxArtProvider(); + + + // Add new provider to the top of providers stack (i.e. the provider will + // be queried first of all). + static void Push(wxArtProvider *provider); + + // Add new provider to the bottom of providers stack (i.e. the provider + // will be queried as the last one). + static void Insert(wxArtProvider *provider); // Remove latest added provider and delete it. - static bool PopProvider(); + static bool Pop(); + + // Remove provider from providers stack but don't delete it. + static bool Remove(wxArtProvider *provider); + + // Delete the given provider and remove it from the providers stack. + static bool Delete(wxArtProvider *provider); - // Remove provider. The provider must have been added previously! - // The provider is _not_ deleted. - static bool RemoveProvider(wxArtProvider *provider); // Query the providers for bitmap with given ID and return it. Return // wxNullBitmap if no provider provides it. @@ -116,6 +146,22 @@ public: const wxArtClient& client = wxART_OTHER, const wxSize& size = wxDefaultSize); + // Get the size hint of an icon from a specific wxArtClient, queries + // the topmost provider if platform_dependent = false + static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false); + +#if WXWIN_COMPATIBILITY_2_6 + // use the corresponding methods without redundant "Provider" suffix + wxDEPRECATED( static void PushProvider(wxArtProvider *provider) ); + wxDEPRECATED( static void InsertProvider(wxArtProvider *provider) ); + wxDEPRECATED( static bool PopProvider() ); + + // use Delete() if this is what you really need, or just delete the + // provider pointer, do not use Remove() as it does not delete the pointer + // unlike RemoveProvider() which does + wxDEPRECATED( static bool RemoveProvider(wxArtProvider *provider) ); +#endif // WXWIN_COMPATIBILITY_2_6 + protected: friend class wxArtProviderModule; // Initializes default provider @@ -125,6 +171,12 @@ protected: // Destroy caches & all providers static void CleanUpProviders(); + // Get the default size of an icon for a specific client + virtual wxSize DoGetSizeHint(const wxArtClient& client) + { + return GetSizeHint(client, true); + } + // Derived classes must override this method to create requested // art resource. This method is called only once per instance's // lifetime for each requested wxArtID. @@ -132,6 +184,9 @@ protected: const wxArtClient& WXUNUSED(client), const wxSize& WXUNUSED(size)) = 0; +private: + static void CommonAddingProvider(); + private: // list of providers: static wxArtProvidersList *sm_providers;