GNOME.org
 

[gtkmm/gtkmm-3maybe] Remove more deprecated methods.

commit 93044b9e4a359dae647ca97ba19383e337d6fafd
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 5 11:28:49 2010 +0100

    Remove more deprecated methods.
    
    * gdk/src/event.hg:
    * gdk/src/pixbuf.hg:
    * gdk/src/window.hg:
    * gtk/src/aboutdialog.hg:
    * gtk/src/action.hg:
    * gtk/src/button.hg:
    * gtk/src/calendar.hg:
    * gtk/src/cellrenderer.hg:
    * gtk/src/cellview.hg:
    * gtk/src/menuitem.hg:
    * gtk/src/menutoolbutton.hg:
    * gtk/src/notebook.[hg|ccg]: Removed more undefs and removed deprecated
    methods that it showed.
    * gtk/gtkmm.h: Don't mention the removed curve.h and inputdialog.h files.
    * demos/gtk-demo/example_treeview_editable_cells.cc: Adapted.

 ChangeLog                                         |   20 ++++++++++++++++++++
 demos/gtk-demo/example_treeview_editable_cells.cc |    4 ++--
 gdk/src/event.hg                                  |    4 ----
 gdk/src/pixbuf.hg                                 |    3 ---
 gdk/src/window.hg                                 |    3 ---
 gtk/gtkmm.h                                       |    2 --
 gtk/src/aboutdialog.hg                            |    3 ---
 gtk/src/action.hg                                 |    3 ---
 gtk/src/button.hg                                 |   10 +---------
 gtk/src/calendar.hg                               |    3 ---
 gtk/src/cellrenderer.hg                           |    3 ---
 gtk/src/cellview.hg                               |    3 ---
 gtk/src/menuitem.hg                               |    3 ---
 gtk/src/menutoolbutton.hg                         |    3 ---
 gtk/src/notebook.ccg                              |   21 ---------------------
 gtk/src/notebook.hg                               |   11 +++--------
 16 files changed, 26 insertions(+), 73 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c3077de..9a74269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 
 	Remove more deprecated methods.
 
+	* gdk/src/event.hg:
+	* gdk/src/pixbuf.hg:
+	* gdk/src/window.hg:
+	* gtk/src/aboutdialog.hg:
+	* gtk/src/action.hg:
+	* gtk/src/button.hg:
+	* gtk/src/calendar.hg:
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/cellview.hg:
+	* gtk/src/menuitem.hg:
+	* gtk/src/menutoolbutton.hg:
+	* gtk/src/notebook.[hg|ccg]: Removed more undefs and removed deprecated 
+	methods that it showed.
+	* gtk/gtkmm.h: Don't mention the removed curve.h and inputdialog.h files.
+	* demos/gtk-demo/example_treeview_editable_cells.cc: Adapted.
+
+2010-01-05  Murray Cumming  <murrayc murrayc com>
+
+	Remove more deprecated methods.
+
 	* gtk/src/filelist.am:
 	* gtk/src/curve.[hg|cc]:
 	* gtk/src/inputdialog.[hg|ccg]: Removed deprecated classes.
diff --git a/demos/gtk-demo/example_treeview_editable_cells.cc b/demos/gtk-demo/example_treeview_editable_cells.cc
index ad8e930..69fb951 100644
--- a/demos/gtk-demo/example_treeview_editable_cells.cc
+++ b/demos/gtk-demo/example_treeview_editable_cells.cc
@@ -247,7 +247,7 @@ void Example_TreeView_EditableCells::add_columns()
     Gtk::TreeView::Column* pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Number", m_columns.number));
   
     //connect signal handlers for auto-storing of edited cell data
-    Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell_renderer();
+    Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell();
     Gtk::CellRendererText* pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
     if(pCellRenderText)
     {
@@ -269,7 +269,7 @@ void Example_TreeView_EditableCells::add_columns()
     Gtk::TreeView::Column* pViewColumn = Gtk::manage(new Gtk::TreeView::Column("Product", m_columns.product));
   
     //connect signal handlers for auto-storing of edited cell data
-    Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell_renderer();
+    Gtk::CellRenderer* pCellRenderer = pViewColumn->get_first_cell();
     Gtk::CellRendererText* pCellRenderText = dynamic_cast<Gtk::CellRendererText*>(pCellRenderer);
     if(pCellRenderText)
     {
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 9c5fbfe..26faa12 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -15,10 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GDK_DISABLE_DEPRECATED
-#m4 _POP()
-
 _DEFS(gdkmm,gdk)
 _CC_INCLUDE(gdk/gdk.h)
 
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 69d8aca..67b7231 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -15,9 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GDK_DISABLE_DEPRECATED
-#m4 _POP()
 // This is for including the config header before any code (such as
 // the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 _CONFIGINCLUDE(gdkmmconfig.h)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index d267ecb..1aa7c18 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -15,9 +15,6 @@
  * Software Foundation Inc. 675 Mass Ave Cambridge MA 02139 USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GDK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gdkmmconfig.h)
 
 #include <gdkmm/drawable.h>
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index 82a2958..7363f2b 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -65,7 +65,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/comboboxentrytext.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/container.h>
-#include <gtkmm/curve.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/editable.h>
@@ -92,7 +91,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/image.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/infobar.h>
-#include <gtkmm/inputdialog.h>
 #include <gtkmm/item.h>
 #include <gtkmm/calendar.h>
 #include <gtkmm/invisible.h>
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 8e487f5..a16329d 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/dialog.h>
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 441dfd1..be4fccb 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -15,9 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/widget.h>
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 6f6988c..73deafe 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -19,12 +19,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-// So we can still wrap the (deprecated) gtk_button_pressed(), gtk_button_clicked(), 
-// and gtk_button_enter functions.
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
-
 #include <gtkmm/bin.h>
 #include <gtkmm/activatable.h>
 #include <gtkmm/stockid.h>
@@ -81,9 +75,7 @@ public:
   explicit Button(const StockID& stock_id);
 
 
-  _IGNORE(gtk_button_pressed, gtk_button_released, gtk_button_clicked) //deprecated
-  _WRAP_METHOD(void enter(), gtk_button_enter)
-  _WRAP_METHOD(void leave(), gtk_button_leave)
+  _IGNORE(gtk_button_pressed, gtk_button_released, gtk_button_clicked, gtk_button_enter, gtk_button_leave) //deprecated
 
   _WRAP_METHOD(void set_relief(ReliefStyle newstyle), gtk_button_set_relief)
   _WRAP_METHOD(ReliefStyle get_relief() const, gtk_button_get_relief)
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 0e9ffbe..bcf3369 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/widget.h>
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 7af542a..ccc5325 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -15,9 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/object.h>
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index ca2e226..92e99b9 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/widget.h>
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index 8cb4630..a2cc1e8 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/item.h>
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index 5195b41..997ed52 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/toolbutton.h>
diff --git a/gtk/src/notebook.ccg b/gtk/src/notebook.ccg
index 59a8846..5b71a50 100644
--- a/gtk/src/notebook.ccg
+++ b/gtk/src/notebook.ccg
@@ -155,16 +155,6 @@ Glib::ustring Page::get_menu_label_text() const
   return parent_->get_menu_label_text(*get_child());
 }
 
-void Page::query_tab_label_packing(bool& expand, bool& fill, PackType& pack_type)
-{
-  parent_->query_tab_label_packing(*get_child(), expand, fill, pack_type);
-}
-
-void Page::set_tab_label_packing(bool expand, bool fill, PackType pack_type)
-{
-  parent_->set_tab_label_packing(*get_child(), expand, fill, pack_type);
-}
-
 /*********************************************************************
 ***** List properties
 *********************************************************************/
@@ -430,17 +420,6 @@ void Notebook::remove_page(Widget& child)
     remove_page(pos);
 }
 
-void Notebook::query_tab_label_packing(Widget& child, bool& expand, bool& fill, PackType& pack_type)
-{
-  gboolean gexpand = false;
-  gboolean gfill = false;
-  GtkPackType gpack_type = GTK_PACK_START;
-  gtk_notebook_query_tab_label_packing(gobj(), child.gobj(), &gexpand, &gfill, &gpack_type);
-  expand = gexpand;
-  fill = gfill;
-  pack_type = (PackType)gpack_type;
-}
-
 int Notebook::prepend_page(Widget& child)
 {
   return gtk_notebook_prepend_page(gobj(), child.gobj(), 0 /* see GTK+ docs */);
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 0164c7b..eb29c25 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -16,9 +16,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#m4 _POP()
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/container.h>
@@ -128,8 +125,6 @@ public:
   void set_menu_label(Widget& menu_label);
   void set_menu_label_text(const Glib::ustring& menu_text);
   Glib::ustring get_menu_label_text() const;
-  void query_tab_label_packing(bool& expand, bool& fill, PackType& pack_type);
-  void set_tab_label_packing(bool expand, bool fill, PackType pack_type);
 };
 
 // Element is the input class
@@ -377,9 +372,7 @@ public:
   _WRAP_METHOD(void set_menu_label(Widget& child, Widget& menu_label), gtk_notebook_set_menu_label)
   _WRAP_METHOD(void set_menu_label_text(Widget& child, const Glib::ustring& menu_text), gtk_notebook_set_menu_label_text)
   _WRAP_METHOD(Glib::ustring get_menu_label_text(Widget& child) const, gtk_notebook_get_menu_label_text)
-  void query_tab_label_packing(Widget& child, bool& expand, bool& fill, PackType& pack_type);
-  _IGNORE(gtk_notebook_query_tab_label_packing)
-  _WRAP_METHOD(void set_tab_label_packing(Widget& child, bool expand, bool fill, PackType pack_type), gtk_notebook_set_tab_label_packing)
+  _IGNORE(gtk_notebook_query_tab_label_packing, gtk_notebook_set_tab_label_packing) //deprecated
   _WRAP_METHOD(void reorder_child(Widget& child, int position), gtk_notebook_reorder_child)
 
   _WRAP_METHOD(bool get_tab_reorderable(Widget& child) const, gtk_notebook_get_tab_reorderable)
@@ -418,6 +411,8 @@ public:
   _WRAP_PROPERTY("enable-popup", bool)
   _WRAP_PROPERTY("homogeneous", bool)
 
+  //TODO: Wrap the child properties, such as tab-fill and tab-expand.
+
 protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
   mutable PageList pages_proxy_;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]