From 450c18313af63d52a01d96ee96cfc45a64b126ac Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 5 Nov 2007 18:49:49 +0000 Subject: [PATCH] Minimum is now GTK+ 2.4 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/artgtk.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 07d8f4cf4c..a888e389bf 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -95,17 +95,14 @@ static const char *wxArtIDToStock(const wxArtID& id) //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) @@ -127,7 +124,6 @@ static const char *wxArtIDToStock(const wxArtID& id) ART(wxART_FIND, GTK_STOCK_FIND) ART(wxART_FIND_AND_REPLACE, GTK_STOCK_FIND_AND_REPLACE) -#endif return NULL; @@ -227,7 +223,6 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) GTK_STATE_NORMAL, size, NULL, NULL); } -#ifdef __WXGTK24__ static GdkPixbuf *CreateThemeIcon(const char *iconname, GtkIconSize iconsize, const wxSize& sz) { @@ -243,7 +238,6 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname, size.x, (GtkIconLookupFlags)0, NULL); } -#endif wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, const wxArtClient& client, @@ -264,12 +258,10 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize); -#ifdef __WXGTK24__ if (!pixbuf && !gtk_check_version(2,4,0)) { pixbuf = CreateThemeIcon(stockid, stocksize, size); } -#endif if (pixbuf && size != wxDefaultSize && (size.x != gdk_pixbuf_get_width(pixbuf) || -- 2.47.2