Correct setting of line width

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index a33fd455adcf12f66ff4dda5d81ffc556282fe64..07d8f4cf4cc1db938811253583085bf2e3437803 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        artstd.cpp
+// Name:        src/gtk/artstd.cpp
 // Purpose:     stock wxArtProvider instance with native GTK+ stock icons
 // Author:      Vaclav Slavik
 // Modified by:
@@ -20,11 +20,19 @@
     #pragma hdrstop
 #endif
 
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if !defined(__WXUNIVERSAL__)
 
 #include "wx/artprov.h"
-#include "wx/module.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 9, 0)
+    // gtk_object_sink
+    #undef GTK_DISABLE_DEPRECATED
+#endif
 #include <gtk/gtk.h>
 
 // compatibility with older GTK+ versions:
@@ -49,7 +57,7 @@ protected:
 
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
-    wxArtProvider::PushProvider(new wxGTK2ArtProvider);
+    Push(new wxGTK2ArtProvider);
 }
 
 // ----------------------------------------------------------------------------
@@ -60,12 +68,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,                           )
@@ -102,14 +110,31 @@ 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;
-    
+
     #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 +145,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)
@@ -156,8 +181,8 @@ 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) + 
+
+        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)
             return s_sizes[i].icon;
@@ -165,7 +190,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         {
             distance = dist;
             best = s_sizes[i].icon;
-        }            
+        }
     }
     return best;
 }
@@ -178,18 +203,18 @@ 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();
         gs_gtkStyle = gtk_rc_get_style(widget);
         wxASSERT( gs_gtkStyle != NULL );
-        g_object_ref(G_OBJECT(gs_gtkStyle));
-        gtk_widget_destroy(widget);
+        g_object_ref(gs_gtkStyle);
+        gtk_object_sink((GtkObject*)widget);
     }
 
     GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid);
@@ -211,7 +236,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,
@@ -226,9 +251,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();
@@ -236,10 +265,9 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
 
 #ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+    if (!pixbuf && !gtk_check_version(2,4,0))
     {
-        if (!pixbuf)
-            pixbuf = CreateThemeIcon(stockid, stocksize, size);
+        pixbuf = CreateThemeIcon(stockid, stocksize, size);
     }
 #endif
 
@@ -251,18 +279,14 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {
-            gdk_pixbuf_unref(pixbuf);
+            g_object_unref (pixbuf);
             pixbuf = p2;
         }
     }
-    
-    if (!pixbuf)
-        return wxNullBitmap;
 
     wxBitmap bmp;
-    bmp.SetWidth(gdk_pixbuf_get_width(pixbuf));
-    bmp.SetHeight(gdk_pixbuf_get_height(pixbuf));
-    bmp.SetPixbuf(pixbuf);
+    if (pixbuf != NULL)
+        bmp.SetPixbuf(pixbuf);
 
     return bmp;
 }
@@ -279,7 +303,7 @@ public:
     {
         if (gs_gtkStyle)
         {
-            g_object_unref(G_OBJECT(gs_gtkStyle));
+            g_object_unref(gs_gtkStyle);
             gs_gtkStyle = NULL;
         }
     }
@@ -289,4 +313,4 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
 
-#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#endif // !defined(__WXUNIVERSAL__)