added wxMOTIF_STR() macro casting away string literal constness for use with Motif...

[wxWidgets.git] / src / gtk / artgtk.cpp

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index a33fd455adcf12f66ff4dda5d81ffc556282fe64..0956482251d2062fd2fd9b402e52006e82f6299b 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/artprov.h"
 #include "wx/module.h"
+#include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 
@@ -102,6 +103,23 @@ static const char *wxArtIDToStock(const wxArtID& id)
     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_NEW,                                 GTK_STOCK_NEW)
+
+    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;
@@ -109,7 +127,7 @@ static const char *wxArtIDToStock(const wxArtID& id)
     #undef ART
 }
 
-static GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
+GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;
@@ -120,7 +138,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)
@@ -229,6 +247,10 @@ 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();