gtkmm r1118 - in branches/gtkmm-2-14: . gtk/gtkmm gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 17 10:16:32 2009
New Revision: 1118
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1118&view=rev

Log:
2009-03-17  Murray Cumming  <murrayc murrayc com>

* gtk/gtkmm/stockid.cc: Implement operator().
* gtk/src/textbuffer.ccg: Actually implement the const get_text(bool) 
method. These fix undefined symbol linker errors when people try to use 
these methods.

Modified:
   branches/gtkmm-2-14/ChangeLog
   branches/gtkmm-2-14/gtk/gtkmm/stockid.cc
   branches/gtkmm-2-14/gtk/src/textbuffer.ccg

Modified: branches/gtkmm-2-14/gtk/gtkmm/stockid.cc
==============================================================================
--- branches/gtkmm-2-14/gtk/gtkmm/stockid.cc	(original)
+++ branches/gtkmm-2-14/gtk/gtkmm/stockid.cc	Tue Mar 17 10:16:32 2009
@@ -59,6 +59,11 @@
   return *this;
 }
 
+StockID::operator bool() const
+{
+  return !(id_.empty());
+}
+  
 bool StockID::equal(const StockID& rhs) const
 {
   // Do an exact per-byte comparison:

Modified: branches/gtkmm-2-14/gtk/src/textbuffer.ccg
==============================================================================
--- branches/gtkmm-2-14/gtk/src/textbuffer.ccg	(original)
+++ branches/gtkmm-2-14/gtk/src/textbuffer.ccg	Tue Mar 17 10:16:32 2009
@@ -537,6 +537,12 @@
   return get_text(begin(), end(), include_hidden_chars);
 }
 
+Glib::ustring TextBuffer::get_text(bool include_hidden_chars) const
+{
+  TextBuffer* unconst = const_cast<TextBuffer*>(this); //Because begin() and end() are not const.
+  return get_text(unconst->begin(), unconst->end(), include_hidden_chars);
+}
+
 Glib::StringArrayHandle TextBuffer::get_serialize_formats() const
 {
   int n_atoms = 0;