[gtkmm] IconInfo: Fix the build.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] IconInfo: Fix the build.
- Date: Mon, 6 Sep 2010 11:04:02 +0000 (UTC)
commit 96523be3d21e5fff7742a6c6fbebdd7f09d6429c
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Sep 6 11:52:20 2010 +0200
IconInfo: Fix the build.
* gtk/src/iconinfo.[hg|ccg]: Correct silly mistakes.
ChangeLog | 6 ++++++
gtk/src/iconinfo.ccg | 11 +++++------
gtk/src/iconinfo.hg | 6 +++---
3 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5299c33..b31a2c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-09-06 Murray Cumming <murrayc murrayc com>
+ IconInfo: Fix the build.
+
+ * gtk/src/iconinfo.[hg|ccg]: Correct silly mistakes.
+
+2010-09-06 Murray Cumming <murrayc murrayc com>
+
gtkmm: Remove the AnchorType enum
* gtk/src/enums.hg: Remove AnchorType enum, not used by anything in gtkmm,
diff --git a/gtk/src/iconinfo.ccg b/gtk/src/iconinfo.ccg
index 5a19868..aea7d04 100644
--- a/gtk/src/iconinfo.ccg
+++ b/gtk/src/iconinfo.ccg
@@ -17,7 +17,7 @@
#include <gtk/gtk.h>
#include <gtkmm/icontheme.h>
-
+
namespace Gtk
{
@@ -34,9 +34,9 @@ bool IconInfo::get_attach_points(Glib::ArrayHandle<Gdk::Point>& /* points */) co
if(c_attach_points)
{
- //TODO: We can't use = with an ArrayHandle.
+ //TODO: We can't use = with an ArrayHandle.
//Investigate whether the bool return value has a special meaning - maybe we can just return an empty ArrayHandle.
- //points = Glib::ArrayHandle<Gdk::Point>(reinterpret_cast<Gdk::Point*>(c_attach_points), (size_t)n_points, Glib::OWNERSHIP_SHALLOW); //We use OWNERSHIP_SHALLOW because we just need to g_free() the array and nothing more.
+ //points = Glib::ArrayHandle<Gdk::Point>(reinterpret_cast<Gdk::Point*>(c_attach_points), (size_t)n_points, Glib::OWNERSHIP_SHALLOW); //We use OWNERSHIP_SHALLOW because we just need to g_free() the array and nothing more.
}
return result;
}
@@ -52,7 +52,7 @@ Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Gdk::Color& fg, con
GError* gerror = 0;
gboolean c_was_symbolic = false;
Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_load_symbolic(const_cast<GtkIconInfo*>(gobj()), const_cast<GdkColor*>(fg.gobj()), const_cast<GdkColor*>(success_color.gobj()), const_cast<GdkColor*>(warning_color.gobj()), const_cast<GdkColor*>(error_color.gobj()), &c_was_symbolic, &(gerror)));
- was_symbolic = *c_was_symbolic;
+ was_symbolic = c_was_symbolic;
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -64,7 +64,7 @@ Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Glib::RefPtr<Style>
GError* gerror = 0;
gboolean c_was_symbolic = false;
Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_load_symbolic_for_style(const_cast<GtkIconInfo*>(gobj()), Glib::unwrap(style), ((GtkStateType)(state)), &c_was_symbolic, &(gerror)));
- was_symbolic = *c_was_symbolic;
+ was_symbolic = c_was_symbolic;
if(gerror)
::Glib::Error::throw_exception(gerror);
@@ -72,4 +72,3 @@ Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon_symbolic(const Glib::RefPtr<Style>
}
} // namespace Gtk
-
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index d20d328..f937518 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -15,12 +15,13 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gtkmm/style.h>
#include <gdkmm/rectangle.h>
#include <gdkmm/pixbuf.h>
#include <gdkmm/types.h>
//#include <gtk/gtkicontheme.h>
-
+
_DEFS(gtkmm,gtk)
namespace Gtk
@@ -49,7 +50,7 @@ public:
//TODO: Documentation
Glib::RefPtr<Gdk::Pixbuf> load_icon_symbolic(const Gdk::Color& fg, const Gdk::Color& success_color, const Gdk::Color& warning_color, const Gdk::Color& error_color, bool& was_symbolic) const;
_IGNORE(gtk_icon_info_load_symbolic)
-
+
Glib::RefPtr<Gdk::Pixbuf> load_icon_symbolic(const Glib::RefPtr<Style>& style, StateType state, bool& was_symbolic) const;
_IGNORE(gtk_icon_info_load_symbolic_for_style)
@@ -60,4 +61,3 @@ public:
};
} // namespace Gtk
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]