X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c2afb6fbc2dd02fa9672fae71767665ce32ae38..7a5e53abb3f9ea13eba2880972306446e4e21e83:/include/wx/artprov.h diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 1c9807f160..adf181ca4a 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -12,7 +12,7 @@ #ifndef _WX_ARTPROV_H_ #define _WX_ARTPROV_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "artprov.h" #endif @@ -22,6 +22,7 @@ class WXDLLEXPORT wxArtProvidersList; class WXDLLEXPORT wxArtProviderCache; +class wxArtProviderModule; // ---------------------------------------------------------------------------- // Types @@ -30,10 +31,10 @@ class WXDLLEXPORT wxArtProviderCache; typedef wxString wxArtClient; typedef wxString wxArtID; -#define wxART_MAKE_CLIENT_ID_FROM_STR(id) id _T("_C") -#define wxART_MAKE_CLIENT_ID(id) wxART_MAKE_CLIENT_ID_FROM_STR(_T(#id)) -#define wxART_MAKE_ART_ID_FROM_STR(id) id -#define wxART_MAKE_ART_ID(id) wxART_MAKE_ART_ID_FROM_STR(_T(#id)) +#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (wxString(id)+_T("_C")) +#define wxART_MAKE_CLIENT_ID(id) _T(#id) _T("_C") +#define wxART_MAKE_ART_ID_FROM_STR(id) (id) +#define wxART_MAKE_ART_ID(id) _T(#id) // ---------------------------------------------------------------------------- // Art clients @@ -83,6 +84,7 @@ typedef wxString wxArtID; #define wxART_QUESTION wxART_MAKE_ART_ID(wxART_QUESTION) #define wxART_WARNING wxART_MAKE_ART_ID(wxART_WARNING) #define wxART_INFORMATION wxART_MAKE_ART_ID(wxART_INFORMATION) +#define wxART_MISSING_IMAGE wxART_MAKE_ART_ID(wxART_MISSING_IMAGE) // ---------------------------------------------------------------------------- // wxArtProvider class @@ -113,10 +115,13 @@ public: const wxArtClient& client = wxART_OTHER, const wxSize& size = wxDefaultSize); +protected: + friend class wxArtProviderModule; + // Initializes default provider + static void InitStdProvider(); // Destroy caches & all providers static void CleanUpProviders(); -protected: // 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.