X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d7457f9cac3386bbc4f16066b0f45fb2da7acea..ba75c6bb8c85705aca6b46871e0fc6548f15a73d:/src/gtk1/artgtk.cpp?ds=sidebyside

diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index 6302fbb37a..a936c31900 100644
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -87,19 +87,45 @@ 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)
+    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;
     
     #undef ART
 }
 
-static GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
+GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;
@@ -110,7 +136,7 @@ static GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
     else if (client == wxART_BUTTON)
         return GTK_ICON_SIZE_BUTTON;
     else
-        return GTK_ICON_SIZE_BUTTON; // this is arbitrary
+        return GTK_ICON_SIZE_INVALID; // this is arbitrary
 }
 
 static GtkIconSize FindClosestIconSize(const wxSize& size)
@@ -192,7 +218,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
                                     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)
 {
@@ -208,7 +234,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }
-#endif // GTK+ >= 2.4.0
+#endif
 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
@@ -219,15 +245,22 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                 wxArtClientToIconSize(client) : 
                                 FindClosestIconSize(size);
 
+    // we must have some size, this is arbitrary
+    if (stocksize == GTK_ICON_SIZE_INVALID)
+        stocksize = GTK_ICON_SIZE_BUTTON;
+
     // allow passing GTK+ stock IDs to wxArtProvider:
     if (!stockid)
         stockid = id.ToAscii();
 
     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 &&