[gtkmm] IconInfo: Added load_icon_symbolic(StyleContext, bool&).



commit c294247f319f9c6b882bbc6b7a3171ba9a4846cf
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Dec 13 11:30:50 2010 +0100

    IconInfo: Added load_icon_symbolic(StyleContext, bool&).
    
    * gtk/src/gtk_methods.defs: Regenerated.
    * gtk/src/iconinfo.[hg|ccg]: Rename load_icon_symoblic() to load_symbolic()
    to match the C function names.
    Add load_icon_symbolic(StyleContext, bool&), to wrap
    gtk_icon_info_load_symbolic_for_context().

 ChangeLog                |   10 ++++++++++
 gtk/src/gtk_methods.defs |   21 ++++++++++++++++++---
 gtk/src/iconinfo.ccg     |   17 +++++++++++++++--
 gtk/src/iconinfo.hg      |    8 +++++---
 4 files changed, 48 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9660088..1f023b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13  Murray Cumming  <murrayc murrayc com>
+
+	IconInfo: Added load_icon_symbolic(StyleContext, bool&).
+
+	* gtk/src/gtk_methods.defs: Regenerated.
+	* gtk/src/iconinfo.[hg|ccg]: Rename load_icon_symoblic() to load_symbolic() 
+	to match the C function names.
+	Add load_icon_symbolic(StyleContext, bool&), to wrap 
+	gtk_icon_info_load_symbolic_for_context().
+
 2010-12-10  Murray Cumming  <murrayc murrayc com>
 
 	pkg-config file: Added gmmprocm4dir.
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index df2a839..ce732e0 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -30346,6 +30346,17 @@
   )
 )
 
+(define-method render_icon
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_render_icon")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("const-gchar*" "stock_id")
+    '("GtkIconSize" "size")
+    '("const-gchar*" "detail")
+  )
+)
+
 (define-method create_pango_context
   (of-object "GtkWidget")
   (c-name "gtk_widget_create_pango_context")
@@ -30367,14 +30378,13 @@
   )
 )
 
-(define-method render_icon
+(define-method render_icon_pixbuf
   (of-object "GtkWidget")
-  (c-name "gtk_widget_render_icon")
+  (c-name "gtk_widget_render_icon_pixbuf")
   (return-type "GdkPixbuf*")
   (parameters
     '("const-gchar*" "stock_id")
     '("GtkIconSize" "size")
-    '("const-gchar*" "detail")
   )
 )
 
@@ -30682,6 +30692,11 @@
 
 ;; From gtkwidgetpath.h
 
+(define-function gtk_widget_path_get_type
+  (c-name "gtk_widget_path_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_widget_path_new
   (c-name "gtk_widget_path_new")
   (is-constructor-of "GtkWidgetPath")
diff --git a/gtk/src/iconinfo.ccg b/gtk/src/iconinfo.ccg
index 0fa2e38..7b19759 100644
--- a/gtk/src/iconinfo.ccg
+++ b/gtk/src/iconinfo.ccg
@@ -47,7 +47,7 @@ IconInfo::operator bool() const
 }
 
 
-Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const Gdk::RGBA& warning_color, const Gdk::RGBA& error_color, bool& was_symbolic) const
+Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_symbolic(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const Gdk::RGBA& warning_color, const Gdk::RGBA& error_color, bool& was_symbolic) const
 {
   GError* gerror = 0;
   gboolean c_was_symbolic = false;
@@ -59,8 +59,21 @@ Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Gdk::RGBA& fg, cons
   return retvalue;
 }
 
+Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_symbolic(const Glib::RefPtr<StyleContext>& style, bool& was_symbolic)
+{
+  GError* gerror = 0;
+  gboolean c_was_symbolic = false;
+  Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_load_symbolic_for_context(gobj(), Glib::unwrap(style), &c_was_symbolic, &(gerror)));
+  was_symbolic = c_was_symbolic;
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+
+  return retvalue;
+}
+
+
 /* deprecated
-Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Glib::RefPtr<Style>& style, StateType state, bool& was_symbolic) const
+Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_symbolic(const Glib::RefPtr<Style>& style, StateType state, bool& was_symbolic) const
 {
   GError* gerror = 0;
   gboolean c_was_symbolic = false;
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index 326299f..38af9cc 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -15,6 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <gtkmm/stylecontext.h>
 #include <gdkmm/rectangle.h>
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/rgba.h>
@@ -48,13 +49,14 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> load_icon() const, gtk_icon_info_load_icon, errthrow)
 
   //TODO: Documentation
-  Glib::RefPtr<Gdk::Pixbuf> load_icon_symbolic(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const Gdk::RGBA& warning_color, const Gdk::RGBA& error_color, bool& was_symbolic) const;
+  Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Gdk::RGBA& fg, const Gdk::RGBA& success_color, const Gdk::RGBA& warning_color, const Gdk::RGBA& error_color, bool& was_symbolic) const;
   _IGNORE(gtk_icon_info_load_symbolic)
 
   _IGNORE(gtk_icon_info_load_symbolic_for_style) //deprecated
 
-  //TODO: _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Glib::RefPtr<StyleContext>& style, bool& was_symbolic), gtk_icon_info_load_symbolic_for_context, errthrow)
-                                                               
+  //TODO: Documentation:
+  Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Glib::RefPtr<StyleContext>& style, bool& was_symbolic);
+  _IGNORE(gtk_icon_info_load_symbolic_for_context)             
 
   _WRAP_METHOD(void set_raw_coordinates(bool raw_coordinates = true), gtk_icon_info_set_raw_coordinates)
   _WRAP_METHOD(bool get_embedded_rect(Gdk::Rectangle& rectangle) const, gtk_icon_info_get_embedded_rect)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]