GNOME.org
 

[gtkmm] Removed deprecated classes.

commit af295a207d96de2b414fdfda1188d44fff9aae34
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri May 1 08:59:59 2009 +0200

    Removed deprecated classes.
    
    * gtk/src/combo.[hg|ccg]:
    * gtk/src/fileselection.[hg|ccg]:
    * gtk/src/optionmenu.[hg|ccg]:
    * gtk/src/progress.[hg|ccg]:
    * gtk/src/tooltips.[hg|ccg]: Removed these deprecated classes.
    * gtk/src/inputdialog.[hg|ccg]:
    * gtk/src/menutoolbutton.[hg|ccg]:
    * gtk/src/eventbox.[hg|ccg]:
    * gtk/src/toolitem.[hg|ccg]:
    * gtk/src/toolbart.[hg|ccg]: Removed uses of these classes.

 ChangeLog                 |   15 ++++
 gtk/gtkmm.h               |    4 -
 gtk/src/combo.ccg         |  124 ----------------------------
 gtk/src/combo.hg          |  197 ---------------------------------------------
 gtk/src/eventbox.hg       |    2 +-
 gtk/src/filelist.am       |    5 +-
 gtk/src/fileselection.ccg |   37 ---------
 gtk/src/fileselection.hg  |  101 -----------------------
 gtk/src/inputdialog.ccg   |    1 -
 gtk/src/inputdialog.hg    |    6 +-
 gtk/src/menutoolbutton.hg |    4 +-
 gtk/src/optionmenu.ccg    |   68 ----------------
 gtk/src/optionmenu.hg     |   66 ---------------
 gtk/src/progress.ccg      |   26 ------
 gtk/src/progress.hg       |   70 ----------------
 gtk/src/toolbar.ccg       |    9 --
 gtk/src/toolbar.hg        |    6 --
 gtk/src/toolitem.ccg      |   10 ---
 gtk/src/toolitem.hg       |   19 +----
 gtk/src/tooltip.hg        |    3 -
 gtk/src/tooltips.ccg      |   40 ---------
 gtk/src/tooltips.hg       |   71 ----------------
 22 files changed, 22 insertions(+), 862 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f945aa2..b994fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-05-01  Murray Cumming  <murrayc murrayc com>
+
+	Removed deprecated classes.
+	
+	* gtk/src/combo.[hg|ccg]:
+	* gtk/src/fileselection.[hg|ccg]:
+	* gtk/src/optionmenu.[hg|ccg]:
+	* gtk/src/progress.[hg|ccg]:
+	* gtk/src/tooltips.[hg|ccg]: Removed these deprecated classes.
+	* gtk/src/inputdialog.[hg|ccg]:
+	* gtk/src/menutoolbutton.[hg|ccg]:	
+	* gtk/src/eventbox.[hg|ccg]:
+	* gtk/src/toolitem.[hg|ccg]:
+	* gtk/src/toolbart.[hg|ccg]: Removed uses of these classes.
+
 2009-04-30  Murray Cumming  <murrayc murrayc com>
 
 	Inherit Buildable.
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index f035f92..3fb65fb 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -118,7 +118,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/cellrenderertoggle.h>
 #include <gtkmm/colorbutton.h>
 #include <gtkmm/colorselection.h>
-#include <gtkmm/combo.h> //TODO: Deprecated.
 #include <gtkmm/combobox.h>
 #include <gtkmm/comboboxentry.h>
 #include <gtkmm/comboboxentrytext.h>
@@ -137,7 +136,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/filechooserwidget.h>
 #include <gtkmm/filefilter.h>
-#include <gtkmm/fileselection.h> //TODO: Deprecated.
 #include <gtkmm/fixed.h>
 #include <gtkmm/fontbutton.h>
 #include <gtkmm/fontselection.h>
@@ -172,7 +170,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/notebook.h>
 #include <gtkmm/object.h>
 #include <gtkmm/offscreenwindow.h>
-#include <gtkmm/optionmenu.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/pagesetup.h>
 #ifndef G_OS_WIN32
@@ -239,7 +236,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/toggletoolbutton.h>
 #include <gtkmm/menutoolbutton.h>
 #include <gtkmm/tooltip.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treemodelfilter.h>
 #include <gtkmm/treemodelsort.h>
diff --git a/gtk/src/eventbox.hg b/gtk/src/eventbox.hg
index 501e00d..3f4f9f0 100644
--- a/gtk/src/eventbox.hg
+++ b/gtk/src/eventbox.hg
@@ -33,7 +33,7 @@ namespace Gtk
  * It will receive any event which is specified
  * with set_events().
  *
- * This widget is generally used to add Gtk::Tooltips, button presses,
+ * This widget is generally used to add Gtk::Tooltip, button presses,
  * and clipping to widgets derived from Gtk::Misc.
  *
  * @ingroup Widgets
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 591ae74..0710cee 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -65,7 +65,6 @@ gtkmm_files_any_hg =		\
 	filechooserdialog.hg	\
 	filechooserwidget.hg	\
 	filefilter.hg		\
-	fileselection.hg	\
 	fixed.hg		\
 	fontbutton.hg		\
 	fontselection.hg	\
@@ -97,7 +96,6 @@ gtkmm_files_any_hg =		\
 	notebook.hg		\
 	object.hg		\
 	offscreenwindow.hg	\
-	optionmenu.hg		\
 	orientable.hg		\
 	pagesetup.hg		\
 	paned.hg		\
@@ -161,7 +159,6 @@ gtkmm_files_any_hg =		\
 	toolpalette.hg		\
 	toolshell.hg		\
 	tooltip.hg		\
-	tooltips.hg		\
 	treedragdest.hg		\
 	treedragsource.hg	\
 	treeiter.hg		\
@@ -187,7 +184,7 @@ gtkmm_files_posix_hg =		\
 	printjob.hg		\
 	printunixdialog.hg
 
-gtkmm_files_deprecated_hg = combo.hg curve.hg inputdialog.hg
+gtkmm_files_deprecated_hg = curve.hg inputdialog.hg
 
 if HOST_WINDOWS_NATIVE
 gtkmm_files_arch_hg =
diff --git a/gtk/src/inputdialog.ccg b/gtk/src/inputdialog.ccg
index 09fc28c..5d21c97 100644
--- a/gtk/src/inputdialog.ccg
+++ b/gtk/src/inputdialog.ccg
@@ -22,6 +22,5 @@
 
 #include <gtk/gtk.h>
 #include <gtkmm/button.h>
-#include <gtkmm/optionmenu.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/table.h>
diff --git a/gtk/src/inputdialog.hg b/gtk/src/inputdialog.hg
index 5bc0d75..71d6a27 100644
--- a/gtk/src/inputdialog.hg
+++ b/gtk/src/inputdialog.hg
@@ -39,10 +39,6 @@ namespace Gtk
 class Button;
 class Table;
 
-_DEPRECATE_IFDEF_START
-class OptionMenu;
-_DEPRECATE_IFDEF_END
-
 class ScrolledWindow;
 
 /** @deprecated As of gtkmm 2.20, this widget has been deprecated since it is too specialized. 
@@ -59,7 +55,7 @@ public:
 
   _MEMBER_GET_PTR(axis_list,axis_list,Table*,GtkWidget*)
   _MEMBER_GET_PTR(axis_box,axis_listbox,ScrolledWindow*,GtkWidget*)
-  _MEMBER_GET_PTR(mode_optionmenu,mode_optionmenu,OptionMenu*,GtkWidget*,deprecated)
+  //TODO: Really remove this? _MEMBER_GET_PTR(mode_optionmenu,mode_optionmenu,OptionMenu*,GtkWidget*,deprecated)
 
   _MEMBER_GET_PTR(close_button,close_button,Button*,GtkWidget*)
   _MEMBER_GET_PTR(save_button,save_button,Button*,GtkWidget*)
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index f5c34e6..5cb631f 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -23,7 +23,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/menu.h>
-#include <gtkmm/tooltips.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/toolbutton_p.h)
@@ -74,7 +73,8 @@ public:
   _WRAP_METHOD(Menu* get_menu(), gtk_menu_tool_button_get_menu)
   _WRAP_METHOD(const Menu* get_menu() const, gtk_menu_tool_button_get_menu, constversion)
 
-  _WRAP_METHOD(void set_arrow_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private), gtk_menu_tool_button_set_arrow_tooltip, deprecated "Use set_arrow_tooltip_text() or set_arrow_tooltip_markup() instead")
+  //gtk_menu_tool_button_set_arrow_tooltip is deprecated
+  _IGNORE(gtk_menu_tool_button_set_arrow_tooltip)
 
   _WRAP_METHOD(void set_arrow_tooltip_text(const Glib::ustring& text), gtk_menu_tool_button_set_arrow_tooltip_text)
   _WRAP_METHOD(void set_arrow_tooltip_markup(const Glib::ustring& markup), gtk_menu_tool_button_set_arrow_tooltip_markup)
diff --git a/gtk/src/toolbar.ccg b/gtk/src/toolbar.ccg
index b0e089a..b39fcf3 100644
--- a/gtk/src/toolbar.ccg
+++ b/gtk/src/toolbar.ccg
@@ -24,7 +24,6 @@
 #include <gtkmm/button.h>
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/radiobutton.h>
-#include <gtkmm/tooltips.h>
 //#include <gtkmm/image.h>
 #include <gtkmm/label.h>
 #include <gtk/gtk.h>
@@ -84,13 +83,5 @@ void Toolbar::unset_drop_highlight_item()
   gtk_toolbar_set_drop_highlight_item(gobj(), 0, 0);
 }
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-Tooltips* Toolbar::get_tooltips_object() const
-{
-  //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
-  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-}
-#endif //GTKMM_DISABLE_DEPRECATED
-
 } // namespace Gtk
 
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 656cf9c..d9f7165 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -123,12 +123,6 @@ public:
   _IGNORE_SIGNAL("move_focus")
   _IGNORE_SIGNAL("focus_home_or_end")
 
-  #ifndef GTKMM_DISABLE_DEPRECATED
-  //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-  ///@deprecated Use the Gtk::Tooltip API instead.
-  Tooltips* get_tooltips_object() const;
-  #endif //GTKMM_DISABLE_DEPRECATED
-
   //Ignore deprecated GtkToolbarAPI:
   //Normally we just deprecate it in gtkmm too,
   //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
diff --git a/gtk/src/toolitem.ccg b/gtk/src/toolitem.ccg
index 5f5be5d..2d58746 100644
--- a/gtk/src/toolitem.ccg
+++ b/gtk/src/toolitem.ccg
@@ -25,15 +25,5 @@
 namespace Gtk
 {
 
-#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& > ToolItem::signal_set_tooltip()
-{
-  //This is an empty implementation to maintain API (and ABI, sort of, but blame GTK+) compatibility.
-  //GTK+ now never emits this signal.
-  return Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& >(this, 0);
-}
-#endif //GTKMM_DISABLE_DEPRECATED
-
-
 } // namespace Gtk
 
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 2ccccd8..8ee9d74 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -24,7 +24,6 @@
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/bin.h>
-#include <gtkmm/tooltips.h>
 #include <gtkmm/activatable.h>
 
 _DEFS(gtkmm,gtk)
@@ -51,7 +50,8 @@ public:
   _WRAP_METHOD(void set_expand(bool expand = true), gtk_tool_item_set_expand)
   _WRAP_METHOD(bool get_expand() const, gtk_tool_item_get_expand)
 
-  _WRAP_METHOD(void set_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private = Glib::ustring()), gtk_tool_item_set_tooltip, deprecated "Use set_tooltip_text() or set_tooltip_markup() instead")
+  //gtk_tool_item_set_tooltip() is deprecated.
+  _IGNORE(gtk_tool_item_set_tooltip)
 
   _WRAP_METHOD(void set_tooltip_text(const Glib::ustring& text),  gtk_tool_item_set_tooltip_text)
   _WRAP_METHOD(void set_tooltip_markup(const Glib::ustring& markup), gtk_tool_item_set_tooltip_markup)
@@ -131,22 +131,7 @@ public:
    */
   _WRAP_SIGNAL(void toolbar_reconfigured(), toolbar_reconfigured)
 
-
-  #ifndef GTKMM_DISABLE_DEPRECATED
-  //Note that we can ifdef this out, only because it doesn't affect class size, because we use no_default_handler:
-  /** This signal is emitted when the toolitem's tooltip changes.
-   * Application developers can use gtk_tool_item_set_tooltip() to
-   * set the item's tooltip.
-   * @deprecated: Use the new Gtk::Tooltip API. This signal will now never be emitted.
-   *
-   * @param tooltips the Tooltips
-   * @param tip_text the tooltip text
-   * @param tip_private the tooltip private text
-   * @result true if the signal was handled, false if not.
-   */
-  Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& > signal_set_tooltip();
   //_WRAP_SIGNAL(bool set_tooltip(Tooltips* tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private), set_tooltip, deprecated) //TODO: Implement deprecated for _WRAP_SIGNAL() to avoid hand-coding this:
-  #endif //GTKMM_DISABLE_DEPRECATED
 
   _WRAP_PROPERTY("visible_horizontal", bool)
   _WRAP_PROPERTY("visible_vertical", bool)
diff --git a/gtk/src/tooltip.hg b/gtk/src/tooltip.hg
index 5942c3c..5affc79 100644
--- a/gtk/src/tooltip.hg
+++ b/gtk/src/tooltip.hg
@@ -29,9 +29,6 @@ namespace Gtk
 
 /** Add tips to your widgets
  *
- * Gtk::Tooltip belongs to the new tooltips API that was introduced in GTK+ 2.12
- * and which deprecates the old Gtk::Tooltips API.
- *
  * Basic tooltips can be realized simply by using set_tooltip_text()
  * or set_tooltip_markup() without any explicit tooltip object.
  *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]