//ART(wxART_REPORT_VIEW, )
//ART(wxART_LIST_VIEW, )
//ART(wxART_NEW_DIR, )
+#ifdef __WXGTK24__
ART(wxART_FOLDER, GTK_STOCK_DIRECTORY)
+ ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY)
+#endif
//ART(wxART_GO_DIR_UP, )
ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE)
ART(wxART_NORMAL_FILE, GTK_STOCK_FILE)
ART(wxART_TICK_MARK, GTK_STOCK_APPLY)
ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL)
+
+#ifdef __WXGTK24__
+ ART(wxART_FLOPPY, GTK_STOCK_FLOPPY)
+ ART(wxART_CDROM, GTK_STOCK_CDROM)
+ ART(wxART_HARDDISK, GTK_STOCK_HARDDISK)
+ ART(wxART_REMOVABLE, GTK_STOCK_HARDDISK)
+
+ ART(wxART_FILE_SAVE, GTK_STOCK_SAVE)
+ ART(wxART_FILE_SAVE_AS, GTK_STOCK_SAVE_AS)
+
+ ART(wxART_COPY, GTK_STOCK_COPY)
+ ART(wxART_CUT, GTK_STOCK_CUT)
+ ART(wxART_PASTE, GTK_STOCK_PASTE)
+ ART(wxART_DELETE, GTK_STOCK_DELETE)
+
+ ART(wxART_UNDO, GTK_STOCK_UNDO)
+ ART(wxART_REDO, GTK_STOCK_REDO)
+
+ ART(wxART_QUIT, GTK_STOCK_QUIT)
+
+ ART(wxART_FIND, GTK_STOCK_FIND)
+ ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
+#endif
return NULL;
GTK_STATE_NORMAL, size, NULL, NULL);
}
-#if GTK_CHECK_VERSION(2,4,0)
+#ifdef __WXGTK24__
static GdkPixbuf *CreateThemeIcon(const char *iconname,
GtkIconSize iconsize, const wxSize& sz)
{
size.x,
(GtkIconLookupFlags)0, NULL);
}
-#endif // GTK+ >= 2.4.0
+#endif
wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
const wxArtClient& client,
GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
-#if GTK_CHECK_VERSION(2,4,0)
- if (!pixbuf)
- pixbuf = CreateThemeIcon(stockid, stocksize, size);
+#ifdef __WXGTK24__
+ if (!gtk_check_version(2,4,0))
+ {
+ if (!pixbuf)
+ pixbuf = CreateThemeIcon(stockid, stocksize, size);
+ }
#endif
if (pixbuf && size != wxDefaultSize &&