[gtkmm] I knew I should have begun using GTKmm-1.3 sooner :(



Hi,

Sorry for being so late with these patches, I should have started messing
with 1.3 sooner.
The below patch contains API change which is why I'm posting it to the
list for approval.

Oh, and it looks like I'll have to do some .cvsignore loving again :)



Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkmm-root/base/ChangeLog,v
retrieving revision 1.431
diff -u -u -r1.431 ChangeLog
--- ChangeLog	6 Aug 2002 18:50:57 -0000	1.431
+++ ChangeLog	7 Aug 2002 15:17:19 -0000
@@ -1,3 +1,13 @@
+2002-08-07  ERDI Gergo  <cactus cactus rulez org>
+
+	* gtk/src/treemodel.ccg (proxy_foreach_iter_callback): Marshall
+	correct return value from callback slot
+
+	* gtk/src/treeview.hg: Removed unused pCellToggle variable
+
+	* gtk/src/bin.ccg (add_label): new overload to support the
+	AlignmentEnum API
+
 2002-08-06  Murray Cumming  <murrayc usa net>
 
 	* Removed Glib::Closure. We don't use it, so it's probably
@@ -143,6 +153,16 @@
 	* Gtk::TreeViewColumn: Added get_first_cell_renderer() so that it
 	  is easier when connecting signals for editable cells.
 	* Gtk::TreeView: Added get_column_cell_renderer(): ditto.
+
+2002-07-20  Murray Cumming  <murrayc usa net>
+
+	* Gtk::TreeView:
+	  - append_column() changed editable parameter to
+	  auto_store_editable. Data in edited cells will automatically be
+	  set in the model when this is specified.
+	  Gtk::TreeViewColumn: Added get_first_cell_renderer() so that it
+	  is easier when connecting signals for editable cells.
+	  Gtk::TreeView: Added get_column_cell_renderer(): ditto.
 
 2002-07-20  Murray Cumming  <murrayc usa net>
 
Index: gtk/src/bin.ccg
===================================================================
RCS file: /cvs/gnome/gtkmm-root/gtk-src/bin.ccg,v
retrieving revision 1.15
diff -u -u -r1.15 bin.ccg
--- gtk/src/bin.ccg	19 Jul 2002 16:03:32 -0000	1.15
+++ gtk/src/bin.ccg	7 Aug 2002 15:17:20 -0000
@@ -42,8 +42,7 @@
 Bin::add_label(const Glib::ustring& str, bool mnemonic /* = false */,
 	             double x_align /* = 0.5 */, double y_align /* = 0.5 */)
 {
-  Label* label = manage(new Label(str, mnemonic));
-  label->set_alignment(x_align, y_align);
+  Label* label = manage(new Label(str, mnemonic, x_align, y_align));
   add(*label);
 
   //This might not always be appropriate:
@@ -52,6 +51,15 @@
     //label->set_mnemonic_widget(*this);
 
   label->show();
+}
+
+void 
+Bin::add_label(const Glib::ustring& str, bool mnemonic,
+	       AlignmentEnum x_align, AlignmentEnum y_align /* = ALIGN_CENTER */)
+{
+  add_label(str, mnemonic,
+	    _gtkmm_align_float_from_enum(x_align),
+	    _gtkmm_align_float_from_enum(y_align));
 }
 
 void
Index: gtk/src/bin.hg
===================================================================
RCS file: /cvs/gnome/gtkmm-root/gtk-src/bin.hg,v
retrieving revision 1.22
diff -u -u -r1.22 bin.hg
--- gtk/src/bin.hg	8 Jul 2002 15:17:30 -0000	1.22
+++ gtk/src/bin.hg	7 Aug 2002 15:17:20 -0000
@@ -57,7 +57,10 @@
   //Convenience methods that don't correspond to GTK+ functions:
 
   void add_label(const Glib::ustring& label, bool mnemonic = false,
-		             double x_align = 0.5, double y_align = 0.5);
+		 double x_align = 0.5, double y_align = 0.5);
+
+  void add_label(const Glib::ustring& label, bool mnemonic,
+		 AlignmentEnum x_align, AlignmentEnum y_align = ALIGN_CENTER);
 
   void add_pixmap(const Glib::RefPtr<Gdk::Pixmap>& pixmap,
 		  const Glib::RefPtr<Gdk::Bitmap>& mask);
Index: gtk/src/treemodel.ccg
===================================================================
RCS file: /cvs/gnome/gtkmm-root/gtk-src/treemodel.ccg,v
retrieving revision 1.19
diff -u -u -r1.19 treemodel.ccg
--- gtk/src/treemodel.ccg	6 Aug 2002 10:05:39 -0000	1.19
+++ gtk/src/treemodel.ccg	7 Aug 2002 15:17:20 -0000
@@ -39,7 +39,7 @@
 
   try
   {
-    gboolean result = slot(Gtk::TreeModel::iterator(model, iter));
+    return (gboolean) slot(Gtk::TreeModel::iterator(model, iter));
   }
   catch(...)
   {
Index: gtk/src/treeview.hg
===================================================================
RCS file: /cvs/gnome/gtkmm-root/gtk-src/treeview.hg,v
retrieving revision 1.49
diff -u -u -r1.49 treeview.hg
--- gtk/src/treeview.hg	29 Jul 2002 14:55:20 -0000	1.49
+++ gtk/src/treeview.hg	7 Aug 2002 15:17:20 -0000
@@ -442,7 +442,6 @@
   //so there are specializations for this tempate.
 
   CellRendererText* pCellText = dynamic_cast<CellRendererText*>(pCellRenderer);
-  CellRendererToggle* pCellToggle = dynamic_cast<CellRendererToggle*>(pCellRenderer);
 
   //Set the appropriate property,
   //and connect to the appropriate signal, sending the model_column too,






-- 
   .--= ULLA! =---------------------.   `We are not here to give users what
   \     http://cactus.rulez.org     \   they want'  -- RMS, at GUADEC 2001
    `---= cactus cactus rulez org =---'
A focit 11 jó játékos és a hazai csapat játsza.




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