r21504 - gnucash/trunk/src/optional/gtkmm/gncmm - [glibmm] Minor updates to the wrappers for cutecash preparation; clarify bool argument of Glib::wrap().

[Christian Stimming]

Author: cstim
Date: 2011-10-28 16:34:31 -0400 (Fri, 28 Oct 2011)
New Revision: 21504
Trac: http://svn.gnucash.org/trac/changeset/21504

Modified:
   gnucash/trunk/src/optional/gtkmm/gncmm/Account.cpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Account.hpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Book.cpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Book.hpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Commodity.hpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.cpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.hpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Split.hpp
   gnucash/trunk/src/optional/gtkmm/gncmm/Transaction.hpp
Log:
[glibmm] Minor updates to the wrappers for cutecash preparation; clarify bool argument of Glib::wrap().

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Account.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Account.cpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Account.cpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -28,9 +28,9 @@
 namespace Glib
 {
 
-Glib::RefPtr<gnc::Account> wrap(::Account* object, bool take_copy)
+Glib::RefPtr<gnc::Account> wrap(::Account* object, bool refuse_ownership)
 {
-    return Glib::RefPtr<gnc::Account>( dynamic_cast<gnc::Account*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
+    return Glib::RefPtr<gnc::Account>( dynamic_cast<gnc::Account*> (Glib::wrap_auto ((GObject*)(object), refuse_ownership)) );
     //We use dynamic_cast<> in case of multiple inheritance.
 }
 

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Account.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Account.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Account.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -187,7 +187,7 @@
  *
  * @relates Gio::FileInfo
  */
-Glib::RefPtr<gnc::Account> wrap(::Account* object, bool take_copy = false);
+Glib::RefPtr<gnc::Account> wrap(::Account* object, bool refuse_ownership = true);
 }
 
 #endif

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Book.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Book.cpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Book.cpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "Book.hpp"
 #include "private/Book_p.hpp"
-//#include "Account.hpp"
+#include "Account.hpp"
 
 namespace Glib
 {
@@ -137,9 +137,9 @@
         return false;
 }
 
-// Account Book::get_root_account()
-// {
-//     return Account(gnc_book_get_root_account (get()));
-// }
+Glib::RefPtr<Account> Book::get_root_account()
+{
+    return Glib::wrap(gnc_book_get_root_account (gobj()));
+}
 
 } // END namespace gnc

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Book.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Book.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Book.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -123,7 +123,7 @@
  *
  * @relates Gio::FileInfo
  */
-Glib::RefPtr<gnc::Book> wrap(::QofBook* object, bool take_copy = false);
+Glib::RefPtr<gnc::Book> wrap(::QofBook* object, bool refuse_ownership = true);
 }
 
 #endif

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Commodity.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Commodity.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Commodity.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -151,7 +151,7 @@
  *
  * @relates Gio::FileInfo
  */
-Glib::RefPtr<gnc::Commodity> wrap(gnc_commodity* object, bool take_copy = false);
+Glib::RefPtr<gnc::Commodity> wrap(gnc_commodity* object, bool refuse_ownership = true);
 }
 
 

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.cpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.cpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -21,6 +21,8 @@
  */
 
 #include "Numeric.hpp"
+#include "Account.hpp"
+#include "Split.hpp"
 
 extern "C"
 {
@@ -33,12 +35,12 @@
 // These are in the cpp file to avoid circular dependency between the
 // headers
 
-// PrintAmountInfo::PrintAmountInfo(const Account& account, bool use_symbol)
-//         : base_class(gnc_account_print_info(account.get(), use_symbol))
-// {}
-// PrintAmountInfo::PrintAmountInfo(const Split& split, bool use_symbol)
-//         : base_class(gnc_split_amount_print_info(split.get(), use_symbol))
-// {}
+PrintAmountInfo::PrintAmountInfo(const Glib::RefPtr<Account> account, bool use_symbol)
+    : base_class(gnc_account_print_info(account->gobj(), use_symbol))
+{}
+PrintAmountInfo::PrintAmountInfo(const Glib::RefPtr<Split> split, bool use_symbol)
+    : base_class(gnc_split_amount_print_info(split->gobj(), use_symbol))
+{}
 
 Glib::ustring Numeric::printAmount(const PrintAmountInfo& info) const
 {

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Numeric.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -34,6 +34,7 @@
 }
 
 #include <glibmm/ustring.h>
+#include <glibmm/refptr.h>
 
 #if GLIB_HAVE_DATETIME
 // Glib::DateTime is new in glibmm-2.29 but very useful
@@ -116,8 +117,8 @@
 
     /* If the boolean set to true, then prefix 3 letter ISO 4217
        currency code to the amount. */
-    PrintAmountInfo(const Account& account, bool use_symbol);
-    PrintAmountInfo(const Split& split, bool use_symbol);
+    PrintAmountInfo(const Glib::RefPtr<Account> account, bool use_symbol);
+    PrintAmountInfo(const Glib::RefPtr<Split> split, bool use_symbol);
 
     static PrintAmountInfo share_places(int decplaces)
     {

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Split.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Split.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Split.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -314,7 +314,7 @@
  *
  * @relates Gio::FileInfo
  */
-Glib::RefPtr<gnc::Split> wrap(::Split* object, bool take_copy = false);
+Glib::RefPtr<gnc::Split> wrap(::Split* object, bool refuse_ownership = true);
 }
 
 

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/Transaction.hpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/Transaction.hpp	2011-10-28 14:14:03 UTC (rev 21503)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/Transaction.hpp	2011-10-28 20:34:31 UTC (rev 21504)
@@ -329,7 +329,7 @@
  *
  * @relates Gio::FileInfo
  */
-Glib::RefPtr<gnc::Transaction> wrap(::Transaction* object, bool take_copy = false);
+Glib::RefPtr<gnc::Transaction> wrap(::Transaction* object, bool refuse_ownership = true);
 }
 
 #endif