Line-up interfaces to use size_t for GetCount()s.

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 209c58e6748d19ce4ae4acac89c1b960b3a335af..8cdcb39bf7ca8fa5ed76702ac262fc5bf500aa90 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>
 
@@ -60,12 +61,12 @@ static const char *wxArtIDToStock(const wxArtID& id)
 {
     #define ART(wxid, gtkid) \
            if (id == wxid) return gtkid;
-    
+
     ART(wxART_ERROR,                               GTK_STOCK_DIALOG_ERROR)
     ART(wxART_INFORMATION,                         GTK_STOCK_DIALOG_INFO)
     ART(wxART_WARNING,                             GTK_STOCK_DIALOG_WARNING)
     ART(wxART_QUESTION,                            GTK_STOCK_DIALOG_QUESTION)
-    
+
     //ART(wxART_HELP_SIDE_PANEL,                     )
     ART(wxART_HELP_SETTINGS,                       GTK_STOCK_SELECT_FONT)
     //ART(wxART_HELP_BOOK,                           )
@@ -110,6 +111,7 @@ static const char *wxArtIDToStock(const wxArtID& id)
     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)
@@ -119,13 +121,13 @@ 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;
-    
+
     #undef ART
 }
 
-static GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
+GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;
@@ -136,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)
@@ -172,7 +174,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         // only use larger bitmaps, scaling down looks better than scaling up:
         if (size.x > s_sizes[i].x || size.y > s_sizes[i].y)
             continue;
-        
+
         unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) + 
                         (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
         if (dist == 0)
@@ -181,7 +183,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         {
             distance = dist;
             best = s_sizes[i].icon;
-        }            
+        }
     }
     return best;
 }
@@ -194,11 +196,11 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
     // FIXME: This code is not 100% correct, because stock pixmap are
     //        context-dependent and may be affected by theme engine, the
     //        correct value can only be obtained for given GtkWidget object.
-    //        
+    //
     //        Fool-proof implementation of stock bitmaps would extend wxBitmap
     //        with "stock-id" representation (in addition to pixmap and pixbuf
     //        ones) and would convert it to pixbuf when rendered.
-    
+
     if (gs_gtkStyle == NULL)
     {
         GtkWidget *widget = gtk_button_new();
@@ -227,7 +229,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
     {
         gtk_icon_size_lookup(iconsize, &size.x, &size.y);
     }
-    
+
     return gtk_icon_theme_load_icon(
                     gtk_icon_theme_get_default(),
                     iconname,
@@ -242,9 +244,13 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
 {
     wxCharBuffer stockid = wxArtIDToStock(id);
     GtkIconSize stocksize = (size == wxDefaultSize) ?
-                                wxArtClientToIconSize(client) : 
+                                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();
@@ -271,7 +277,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
             pixbuf = p2;
         }
     }
-    
+
     if (!pixbuf)
         return wxNullBitmap;