use CanSetValueAs() instead of CanGetValueAs() in wxGridCellBoolEditor::EndEdit

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 6c0a9380a26bac4debbf5491c0bc7945c99165e5..7bc18ba46cf755936ba1d66261d3ca73ed1a7f60 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:
 // Purpose:     stock wxArtProvider instance with native GTK+ stock icons
 // Author:      Vaclav Slavik
 // Modified by:


@@ -20,12 +20,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-

 #include "wx/artprov.h"
 #include "wx/artprov.h"

-#include "wx/module.h"
-
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 // compatibility with older GTK+ versions:
 #ifndef GTK_STOCK_FILE
 
 // compatibility with older GTK+ versions:
 #ifndef GTK_STOCK_FILE


@@ -49,23 +45,26 @@ protected:
 
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 
 /*static*/ void wxArtProvider::InitNativeProvider()
 {

-    wxArtProvider::PushProvider(new wxGTK2ArtProvider);
+    Push(new wxGTK2ArtProvider);

 }
 
 // ----------------------------------------------------------------------------
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 

-static const char *wxArtIDToStock(const wxArtID& id)
+namespace
+{
+
+const char *wxArtIDToStock(const wxArtID& id)

 {
     #define ART(wxid, gtkid) \
            if (id == wxid) return gtkid;
 {
     #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_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,                           )
     //ART(wxART_HELP_SIDE_PANEL,                     )
     ART(wxART_HELP_SETTINGS,                       GTK_STOCK_SELECT_FONT)
     //ART(wxART_HELP_BOOK,                           )


@@ -87,17 +86,14 @@ static const char *wxArtIDToStock(const wxArtID& id)
     //ART(wxART_REPORT_VIEW,                         )
     //ART(wxART_LIST_VIEW,                           )
     //ART(wxART_NEW_DIR,                             )
     //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)
     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)
 
     //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_FLOPPY,                              GTK_STOCK_FLOPPY)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)


@@ -119,14 +115,13 @@ static const char *wxArtIDToStock(const wxArtID& id)
 
     ART(wxART_FIND,                                GTK_STOCK_FIND)
     ART(wxART_FIND_AND_REPLACE,                    GTK_STOCK_FIND_AND_REPLACE)
 
     ART(wxART_FIND,                                GTK_STOCK_FIND)
     ART(wxART_FIND_AND_REPLACE,                    GTK_STOCK_FIND_AND_REPLACE)

-#endif
-    
+

     return NULL;
     return NULL;

-    
+

     #undef ART
 }
 
     #undef ART
 }
 

-GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
+GtkIconSize ArtClientToIconSize(const wxArtClient& client)

 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;
 {
     if (client == wxART_TOOLBAR)
         return GTK_ICON_SIZE_LARGE_TOOLBAR;


@@ -140,7 +135,7 @@ GtkIconSize wxArtClientToIconSize(const wxArtClient& client)
         return GTK_ICON_SIZE_INVALID; // this is arbitrary
 }
 
         return GTK_ICON_SIZE_INVALID; // this is arbitrary
 }
 

-static GtkIconSize FindClosestIconSize(const wxSize& size)
+GtkIconSize FindClosestIconSize(const wxSize& size)

 {
     #define NUM_SIZES 6
     static struct
 {
     #define NUM_SIZES 6
     static struct


@@ -160,10 +155,8 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
         for (size_t i = 0; i < NUM_SIZES; i++)
         {
         s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
         for (size_t i = 0; i < NUM_SIZES; i++)
         {

-            gtk_icon_size_lookup_for_settings(
-                              gtk_settings_get_for_screen(gdk_screen_get_default()),
-                              s_sizes[i].icon,
-                              &s_sizes[i].x, &s_sizes[i].y);
+            gtk_icon_size_lookup(s_sizes[i].icon,
+                                 &s_sizes[i].x, &s_sizes[i].y);

         }
         s_sizesInitialized = true;
     }
         }
         s_sizesInitialized = true;
     }


@@ -175,8 +168,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;
         // 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;
                         (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
         if (dist == 0)
             return s_sizes[i].icon;


@@ -184,45 +177,33 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         {
             distance = dist;
             best = s_sizes[i].icon;
         {
             distance = dist;
             best = s_sizes[i].icon;

-        }            
+        }

     }
     return best;
 }
 
     }
     return best;
 }
 

-
-static GtkStyle *gs_gtkStyle = NULL;
-
-static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
+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.
 {
     // 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.
     //        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);
-    }

 
 

-    GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid);
+    GtkStyle* style = wxGTKPrivate::GetButtonWidget()->style;
+    GtkIconSet* iconset = gtk_style_lookup_icon_set(style, stockid);

 
     if (!iconset)
         return NULL;
 
 
     if (!iconset)
         return NULL;
 

-    return gtk_icon_set_render_icon(iconset, gs_gtkStyle,
+    return gtk_icon_set_render_icon(iconset, style,

                                     gtk_widget_get_default_direction(),
                                     GTK_STATE_NORMAL, size, NULL, NULL);
 }
 
                                     gtk_widget_get_default_direction(),
                                     GTK_STATE_NORMAL, size, NULL, NULL);
 }
 

-#ifdef __WXGTK24__
-static GdkPixbuf *CreateThemeIcon(const char *iconname,
+GdkPixbuf *CreateThemeIcon(const char *iconname,

                                   GtkIconSize iconsize, const wxSize& sz)
 {
     wxSize size(sz);
                                   GtkIconSize iconsize, const wxSize& sz)
 {
     wxSize size(sz);


@@ -230,14 +211,15 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
     {
         gtk_icon_size_lookup(iconsize, &size.x, &size.y);
     }
     {
         gtk_icon_size_lookup(iconsize, &size.x, &size.y);
     }

-    
+

     return gtk_icon_theme_load_icon(
                     gtk_icon_theme_get_default(),
                     iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }
     return gtk_icon_theme_load_icon(
                     gtk_icon_theme_get_default(),
                     iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }

-#endif
+
+} // anonymous namespace

 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,


@@ -245,7 +227,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
 {
     wxCharBuffer stockid = wxArtIDToStock(id);
     GtkIconSize stocksize = (size == wxDefaultSize) ?
 {
     wxCharBuffer stockid = wxArtIDToStock(id);
     GtkIconSize stocksize = (size == wxDefaultSize) ?

-                                wxArtClientToIconSize(client) : 
+                                ArtClientToIconSize(client) :

                                 FindClosestIconSize(size);
 
     // we must have some size, this is arbitrary
                                 FindClosestIconSize(size);
 
     // we must have some size, this is arbitrary


@@ -257,14 +239,8 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
         stockid = id.ToAscii();
 
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
         stockid = id.ToAscii();
 
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);

-
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        if (!pixbuf)
-            pixbuf = CreateThemeIcon(stockid, stocksize, size);
-    }
-#endif
+    if (!pixbuf)
+        pixbuf = CreateThemeIcon(stockid, stocksize, size);

 
     if (pixbuf && size != wxDefaultSize &&
         (size.x != gdk_pixbuf_get_width(pixbuf) ||
 
     if (pixbuf && size != wxDefaultSize &&
         (size.x != gdk_pixbuf_get_width(pixbuf) ||


@@ -274,42 +250,31 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {

-            gdk_pixbuf_unref(pixbuf);
+            g_object_unref (pixbuf);

             pixbuf = p2;
         }
     }
             pixbuf = p2;
         }
     }

-    
-    if (!pixbuf)
-        return wxNullBitmap;

 
     wxBitmap bmp;
 
     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;
 }
 
 // ----------------------------------------------------------------------------
 
     return bmp;
 }
 
 // ----------------------------------------------------------------------------

-// Cleanup
+// wxArtProvider::GetNativeSizeHint()

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxArtGtkModule: public wxModule
+/*static*/
+wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)

 {
 {

-public:
-    bool OnInit() { return true; }
-    void OnExit()
-    {
-        if (gs_gtkStyle)
-        {
-            g_object_unref(G_OBJECT(gs_gtkStyle));
-            gs_gtkStyle = NULL;
-        }
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxArtGtkModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
-
-#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    // Gtk has specific sizes for each client, see artgtk.cpp
+    GtkIconSize gtk_size = ArtClientToIconSize(client);
+    // no size hints for this client
+    if (gtk_size == GTK_ICON_SIZE_INVALID)
+        return wxDefaultSize;
+    gint width, height;
+    gtk_icon_size_lookup( gtk_size, &width, &height);
+    return wxSize(width, height);
+}