GNOME.org
 

[gtkmm/gtkmm-3maybe] Removed deprecated classes.

commit 12d44d043009042328125c2f9a3b3ed68f32fdb3
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/Makefile_list_of_hg.am_fragment |    8 +-
 gtk/src/combo.ccg                       |  124 -------------------
 gtk/src/combo.hg                        |  203 -------------------------------
 gtk/src/eventbox.hg                     |    2 +-
 gtk/src/fileselection.ccg               |   37 ------
 gtk/src/fileselection.hg                |  103 ----------------
 gtk/src/inputdialog.ccg                 |    1 -
 gtk/src/inputdialog.hg                  |    6 +-
 gtk/src/menutoolbutton.hg               |    4 +-
 gtk/src/optionmenu.ccg                  |   68 ----------
 gtk/src/optionmenu.hg                   |   67 ----------
 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                     |   20 +---
 gtk/src/tooltip.hg                      |    3 -
 gtk/src/tooltips.ccg                    |   40 ------
 gtk/src/tooltips.hg                     |   69 -----------
 22 files changed, 25 insertions(+), 870 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fde935..86b2581 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 0db1f2f..2b43278 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -58,7 +58,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>
@@ -77,7 +76,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>
@@ -110,7 +108,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/misc.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/object.h>
-#include <gtkmm/optionmenu.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/pagesetup.h>
 #include <gtkmm/pagesetupunixdialog.h>
@@ -169,7 +166,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/Makefile_list_of_hg.am_fragment b/gtk/src/Makefile_list_of_hg.am_fragment
index 20f14a8..7c36e92 100644
--- a/gtk/src/Makefile_list_of_hg.am_fragment
+++ b/gtk/src/Makefile_list_of_hg.am_fragment
@@ -15,12 +15,12 @@ files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongr
           dialog.hg drawingarea.hg \
           editable.hg entry.hg entrycompletion.hg enums.hg eventbox.hg expander.hg \
           filechooser.hg filechooserbutton.hg filechooserwidget.hg filechooserdialog.hg filefilter.hg \
-          fileselection.hg fixed.hg fontbutton.hg fontselection.hg frame.hg \
+          fixed.hg fontbutton.hg fontselection.hg frame.hg \
           handlebox.hg \
           iconfactory.hg iconset.hg iconsource.hg iconinfo.hg icontheme.hg iconview.hg image.hg imagemenuitem.hg inputdialog.hg invisible.hg item.hg \
           label.hg layout.hg linkbutton.hg liststore.hg \
           main.hg menu.hg menubar.hg menuitem.hg menushell.hg menutoolbutton.hg messagedialog.hg misc.hg \
-          notebook.hg object.hg optionmenu.hg orientable.hg \
+          notebook.hg object.hg orientable.hg \
           paned.hg plug.hg progressbar.hg \
 	  papersize.hg pagesetup.hg printsettings.hg printcontext.hg printoperation.hg printoperationpreview.hg \
 	  radioaction.hg radiobutton.hg radiomenuitem.hg radiotoolbutton.hg range.hg rc.hg \
@@ -32,12 +32,12 @@ files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongr
           table.hg targetlist.hg tearoffmenuitem.hg \
           textattributes.hg textbuffer.hg textchildanchor.hg textiter.hg textmark.hg texttag.hg texttagtable.hg textview.hg \
           toggleaction.hg \
-          togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg toolshell.hg tooltips.hg tooltip.hg \
+          togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg toolshell.hg tooltip.hg \
           treedragdest.hg treedragsource.hg treepath.hg treerowreference.hg treeselection.hg treesortable.hg \
           treeiter.hg treemodel.hg treemodelfilter.hg treemodelsort.hg treestore.hg treeview.hg treeviewcolumn.hg \
           viewport.hg volumebutton.hg uimanager.hg \
           widget.hg window.hg
 
-files_general_deprecated_hg = combo.hg 
+files_general_deprecated_hg = 
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
diff --git a/gtk/src/combo.ccg b/gtk/src/combo.ccg
deleted file mode 100644
index 6b1399d..0000000
--- a/gtk/src/combo.ccg
+++ /dev/null
@@ -1,124 +0,0 @@
-// -*- c++ -*-
-/* $Id: combo.ccg,v 1.2 2003/10/17 16:18:24 murrayc Exp $ */
-
-/* 
- *
- * Copyright 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/button.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/window.h>
-#include <gtkmm/item.h>
-
-namespace Gtk
-{
-
-namespace ComboDropDown_Helpers
-{
-
-ComboDropDownList::iterator ComboDropDownList::insert(ComboDropDownList::iterator position, const Element& item)
-{
-  int pos = -1;
-
-  if(position.node_)
-    pos = g_list_position(glist(), position.node_);
-
-  // gtk+ inserts the GList node allocated by g_list_append into the list as is!
-  gtk_list_insert_items((GtkList*)gparent(), g_list_append(0, const_cast<GtkWidget*>(item.Widget::gobj())), pos);
-
-  return --position;
-}
-
-void ComboDropDownList::remove(const_reference child)
-{
-  GList child_list;
-  child_list.data = (gpointer)child.gobj();
-  child_list.next = child_list.prev = 0;
-  gtk_list_remove_items(GTK_LIST(gparent_), &child_list);
-}
-
-ComboDropDownList::iterator ComboDropDownList::erase(iterator position)
-{
-  //Check that it is a valid iterator, to a real item:
-  if ( !position.node_|| (position == end()) )
-    return end();
-
-  //Get an iterator the the next item, to return:
-  iterator next = position;
-  next++;
-
-  //Use GTK+ C function to remove it, by providing the GtkWidget*:
-  GList child_list;
-  child_list.data = (gpointer)position->gobj();
-  child_list.next = child_list.prev = 0;
-  gtk_list_remove_items(GTK_LIST(gparent_), &child_list);
-
-  return next;
-}
-
-} // namespace ComboList_Helpers
-
-ComboDropDown::ComboDropDownList& ComboDropDown::children()
-{
-  children_proxy_ = ComboDropDownList(gobj());
-  return children_proxy_;
-}
-
-const ComboDropDown::ComboDropDownList& ComboDropDown::children() const
-{
-  children_proxy_ = ComboDropDownList(const_cast<GtkList*>(gobj()));
-  return children_proxy_;
-}
-
-} // namespace Gtk
-
-
-namespace Gtk
-{
-
-void Combo::remove_item_string(Gtk::Item& item)
-{
-  gtk_combo_set_item_string(gobj(), item.gobj(), 0);
-}
-
-Glib::ListHandle<Glib::ustring> Combo::get_popdown_strings() const
-{
-  GList* popdown_strings = 0;
-
-  GList *const list_children =
-      gtk_container_get_children(reinterpret_cast<GtkContainer*>(gobj()->list));
-
-  for(const GList* node = list_children; node != 0; node = node->next)
-  {
-    GtkLabel *const label = reinterpret_cast<GtkLabel*>(
-        gtk_bin_get_child(static_cast<GtkBin*>(node->data)));
-
-    popdown_strings = g_list_prepend(
-        popdown_strings, const_cast<char*>(gtk_label_get_text(label)));
-  }
-
-  g_list_free(list_children);
-  popdown_strings = g_list_reverse(popdown_strings);
-
-  return Glib::ListHandle<Glib::ustring>(popdown_strings, Glib::OWNERSHIP_SHALLOW);
-}
-
-} // namespace Gtk
-
diff --git a/gtk/src/combo.hg b/gtk/src/combo.hg
deleted file mode 100644
index eca6a4f..0000000
--- a/gtk/src/combo.hg
+++ /dev/null
@@ -1,203 +0,0 @@
-/* $Id: combo.hg,v 1.7 2005/11/29 16:38:10 murrayc Exp $ */
-
-/* combo.h
- * 
- * Copyright (C) 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-// This is for including the config header before any code (such as
-// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
-_CONFIGINCLUDE(gtkmmconfig.h)
-
-#include <glibmm/listhandle.h>
-#include <glibmm/helperlist.h>
-#include <gtkmm/box.h>
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/item.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/box_p.h)
-_PINCLUDE(gtkmm/private/item_p.h)
-
-namespace Gtk
-{
-
-
-/** An item in a ComboDropDownList.
- * 
- * Items in a ComboDropDownList inherit Item. Two signals are added.
- *
- * @deprecated Use the ComboBox widget instead. 
- */
-class ComboDropDownItem : public Gtk::Item
-{
-  _CLASS_GTKOBJECT(ComboDropDownItem,GtkListItem,GTK_LIST_ITEM,Gtk::Item,GtkItem)
-  _IS_DEPRECATED
-  _IGNORE(gtk_list_item_select,gtk_list_item_deselect)
-
-public:
-  _CTOR_DEFAULT
-
-  _WRAP_SIGNAL(void scroll_horizontal(ScrollType scroll_type, float position), "scroll-horizontal")
-  _WRAP_SIGNAL(void scroll_vertical(ScrollType scroll_type, float position), "scroll-vertical")
-};
-
-
-namespace ComboDropDown_Helpers
-{
-
-typedef Gtk::ComboDropDownItem Element;
-
-#m4 include(list.m4)
-  GP_LIST(ComboDropDownList,ComboDropDown,GtkList,ComboDropDownItem,children)
-  GP_LIST_ITER(Glib::List_Cpp_Iterator<GtkListItem, ComboDropDownItem>)
-  GP_LIST_FIND()
-  GP_LIST_END()
-
-} /* namespace ComboDropDown_Helpers */
-
-
-class Combo;
-
-/** The dropdown list of a Combo.
- * 
- * A combo is a compound widget which crosses a text entry area and a pull
- * down list. The dropdown list is implemented with the deprecated GtkList
- * widget on the gtk+ side. ComboDropDown is a thin wrapper around GtkList
- * containing just the functionality necessary for a Combo's list. To add
- * and remove items use the STL-style interface that is accessible through
- * ComboDropDown::children().
- *
- * @deprecated Use the ComboBox widget instead.
- */
-class ComboDropDown : public Gtk::Container
-{
-  _CLASS_GTKOBJECT(ComboDropDown,GtkList,GTK_LIST,Gtk::Container,GtkContainer)
-  _IS_DEPRECATED
-  _IGNORE(gtk_list_remove_items_no_unref,gtk_list_select_item,gtk_list_unselect_item,gtk_list_set_selection_mode,gtk_list_extend_selection,gtk_list_start_selection,gtk_list_end_selection,gtk_list_select_all,gtk_list_unselect_all,gtk_list_toggle_add_mode,gtk_list_toggle_focus_row,gtk_list_toggle_row,gtk_list_undo_selection,gtk_list_end_drag_selection)
-public:
-  typedef ComboDropDown_Helpers::ComboDropDownList ComboDropDownList;
-
-protected:
-  _CTOR_DEFAULT
-  friend class Combo;
-public:
-
-  _WRAP_METHOD(void scroll_horizontal(ScrollType scroll_type, float position), gtk_list_scroll_horizontal)
-  _WRAP_METHOD(void scroll_vertical(ScrollType scroll_type, float position), gtk_list_scroll_vertical)
-
-  ComboDropDownList& children();
-  const ComboDropDownList& children() const;
-
-  _IGNORE(gtk_list_insert_items)
-  _IGNORE(gtk_list_append_items,gtk_list_prepend_items)
-  _IGNORE(gtk_list_child_position)
-  _IGNORE(gtk_list_remove_items)
-
-  _WRAP_SIGNAL(void select_child(Widget& item), "select_child")
-  _WRAP_SIGNAL(void selection_changed(), "selection_changed")
-  _WRAP_SIGNAL(void unselect_child(Widget& item), "unselect_child")
-
-protected:
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-  mutable ComboDropDownList children_proxy_;
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-};
-
-
-class ScrolledWindow;
-class Window;
-
-/** A text entry field with a dropdown list.
- * 
- * A combo is a compound widget which crosses a text entry area and a pull
- * down list.  It may allow text entry or it may just allow list
- * values depending on the settings.
- *
- * Access members allow altering of the widget components.
- *
- * @deprecated Use the ComboBox widget instead.
- */
-class Combo : public HBox
-{
-  _CLASS_GTKOBJECT(Combo,GtkCombo,GTK_COMBO,Gtk::HBox,GtkHBox)
-  _IS_DEPRECATED
-public:
-
-  _CTOR_DEFAULT
-  
-  /** Allow direct text entry
-   * Whether the text in the entry must be or not be in the list.
-   *
-   * @param value Set to true if the value must be in list.
-   * @param empty Set to true if the text area is allowed to be empty.
-   */
-  _WRAP_METHOD(void set_value_in_list(bool value = true, bool empty = false), gtk_combo_set_value_in_list)
-
-  /** Set arrows keys to change value
-   * Up and down will scroll through the list items.
-   * Useful when there is a small list of value that the
-   * list must have.
-   *
-   * @param arrows_on true indicates the arrow keys scroll.
-   */
-  _WRAP_METHOD(void set_use_arrows(bool arrows_on = true), gtk_combo_set_use_arrows)
-
-  /** Set arrows keys to change if value not in list
-   * Up and down will scroll through the list items but only
-   * change the current value if the text does not match a list item..
-   * Useful when there is a small list of value that the
-   * list must have.
-   *
-   * @param arrows_always true indicates the value will change.
-   */
-  _WRAP_METHOD(void set_use_arrows_always(bool arrows_always = true), gtk_combo_set_use_arrows_always)
-
-  /** Sets list case sensitive
-   * Determines if the list items and text comparisons for
-   * set_use_arrows_always() should be case sensitive.
-   */
-  _WRAP_METHOD(void set_case_sensitive(bool val = true), gtk_combo_set_case_sensitive)
-
-  /** Set the current entry Glib::ustring
-   * Call this function on an item if it isn't a label or you
-   * want it to have a different value to be displayed in the entry
-   */
-  _WRAP_METHOD(void set_item_string(Gtk::Item& item, const Glib::ustring& item_value), gtk_combo_set_item_string)
-   void remove_item_string(Gtk::Item& item);
-
-  /// Insert a list of items.
-  _WRAP_METHOD(void set_popdown_strings(const Glib::ListHandle<Glib::ustring>& strings), gtk_combo_set_popdown_strings)
-
-  Glib::ListHandle<Glib::ustring> get_popdown_strings() const;
-
-  _WRAP_METHOD(void disable_activate(), gtk_combo_disable_activate)
-
-  _MEMBER_GET_PTR(entry,entry,Entry*,GtkWidget*)
-  _MEMBER_GET_PTR(list,list,ComboDropDown*,GtkWidget*)
-
-  _WRAP_PROPERTY("enable-arrow-keys", bool)
-  _WRAP_PROPERTY("enable-arrows-always", bool)
-  _WRAP_PROPERTY("case-sensitive", bool)
-  _WRAP_PROPERTY("allow-empty", bool)
-  _WRAP_PROPERTY("value-in-list", bool)
-};
-
-
-} /* namespace Gtk */
-
-
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/fileselection.ccg b/gtk/src/fileselection.ccg
deleted file mode 100644
index 9e05461..0000000
--- a/gtk/src/fileselection.ccg
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- c++ -*-
-/* $Id: fileselection.ccg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/box.h>
-#include <gtkmm/button.h>
-
-
-namespace Gtk
-{
-
-FileSelection::FileSelection()
-:
-  _CONSTRUCT("title", (char*) 0)
-{}
-
-} // namespace Gtk
-
diff --git a/gtk/src/fileselection.hg b/gtk/src/fileselection.hg
deleted file mode 100644
index 26fbe60..0000000
--- a/gtk/src/fileselection.hg
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $Id: fileselection.hg,v 1.4 2005/11/29 16:38:10 murrayc Exp $ */
-
-
-/* fileselection.h
- * 
- * Copyright (C) 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-// This is for including the config header before any code (such as
-// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
-_CONFIGINCLUDE(gtkmmconfig.h)
-
-#include <gtkmm/dialog.h>
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/box.h>
-#include <gtkmm/treeview.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/optionmenu.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/dialog_p.h)
-
-namespace Gtk
-{
-
-/** Prompt the user for a file or directory name.
- *
- * Gtk::FileSelection should be used to retrieve file or directory names from
- * the user. It will create a new dialog window containing a directory list,
- * and a file list corresponding to the current working directory. The
- * filesystem can be navigated using the directory list or the drop-down
- * history menu. Alternatively, the TAB key can be used to navigate using
- * filename completion - common in text based editors such as emacs and jed.
- *
- * @deprecated Use the FileChooserDialog instead.
- */
-class FileSelection : public Dialog
-{
-  _CLASS_GTKOBJECT(FileSelection,GtkFileSelection,GTK_FILE_SELECTION,Gtk::Dialog,GtkDialog)
-  _UNMANAGEABLE
-  _IS_DEPRECATED
-public:
-
-  FileSelection();
-  _WRAP_CTOR(FileSelection(const Glib::ustring& title), gtk_file_selection_new)
-
-#m4 dnl // Rarely needed -- could be used by accident if it were in convert_gtk.m4.
-#m4 _CONVERSION(`const std::string&', `const gchar*', `($3).c_str()')
-
-  _WRAP_METHOD(void set_filename(const std::string& filename), gtk_file_selection_set_filename)
-
-#m4 dnl // This isn't in convert_gtk.m4, because usually we need to check for NULL.
-#m4 _CONVERSION(`const gchar*', `std::string', `$2($3)')
-
-  _WRAP_METHOD(std::string get_filename() const, gtk_file_selection_get_filename)
-
-  _WRAP_METHOD(void complete(const Glib::ustring& pattern), gtk_file_selection_complete)
-  _WRAP_METHOD(void show_fileop_buttons(), gtk_file_selection_show_fileop_buttons)
-  _WRAP_METHOD(void hide_fileop_buttons(), gtk_file_selection_hide_fileop_buttons)
-
-#m4 dnl // This isn't in convert_gtk.m4, since the gchar** ownership policy often differs.
-#m4 _CONVERSION(`gchar**', `Glib::ArrayHandle<std::string>', `$2($3, Glib::OWNERSHIP_DEEP)')
-
-  _WRAP_METHOD(Glib::ArrayHandle<std::string> get_selections() const, gtk_file_selection_get_selections)
-
-  _WRAP_METHOD(void set_select_multiple(bool select_multiple = true), gtk_file_selection_set_select_multiple)
-  _WRAP_METHOD(bool get_select_multiple() const, gtk_file_selection_get_select_multiple)
-
-  //: Accessors
-  _MEMBER_GET_PTR(dir_list, dir_list, TreeView*, GtkWidget*)
-  _MEMBER_GET_PTR(file_list, file_list, TreeView*, GtkWidget*)
-  _MEMBER_GET_PTR(history_pulldown, history_pulldown, OptionMenu*, GtkWidget*)
-  _MEMBER_GET_PTR(selection_entry, selection_entry, Entry*, GtkWidget*)
-  _MEMBER_GET_PTR(selection_text, selection_text, Label*, GtkWidget*)
-  _MEMBER_GET_PTR(main_vbox, main_vbox, VBox*, GtkWidget*)
-  _MEMBER_GET_PTR(ok_button, ok_button, Button*, GtkWidget*)
-  _MEMBER_GET_PTR(cancel_button, cancel_button, Button*, GtkWidget*)
-  _MEMBER_GET_PTR(help_button, help_button, Button*, GtkWidget*)
-  _MEMBER_GET_PTR(button_area, button_area, HButtonBox*, GtkWidget*)
-  _MEMBER_GET_PTR(action_area, action_area, HBox*, GtkWidget*)
-
-  _WRAP_PROPERTY("show-fileops", bool)
-  _WRAP_PROPERTY("filename", std::string)
-  _WRAP_PROPERTY("select_multiple", bool)
-};
-
-} // namespace Gtk
-
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 f3f0096..6f7f2ca 100644
--- a/gtk/src/inputdialog.hg
+++ b/gtk/src/inputdialog.hg
@@ -33,10 +33,6 @@ namespace Gtk
 class Button;
 class Table;
 
-_DEPRECATE_IFDEF_START
-class OptionMenu;
-_DEPRECATE_IFDEF_END
-
 class ScrolledWindow;
 
 // Don't list this in the documentation's Dialogs group because it isn't really useful
@@ -52,7 +48,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 d8f6c50..10174d0 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -21,7 +21,6 @@
 
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/menu.h>
-#include <gtkmm/tooltips.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/toolbutton_p.h)
@@ -73,7 +72,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/optionmenu.ccg b/gtk/src/optionmenu.ccg
deleted file mode 100644
index 5882a19..0000000
--- a/gtk/src/optionmenu.ccg
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- c++ -*-
-/* $Id: optionmenu.ccg,v 1.6 2004/04/17 14:44:45 murrayc Exp $ */
-
-/* 
- *
- * Copyright 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtkmm/menu.h>
-#include <gtkmm/window.h>
-#include <gtk/gtk.h>
-
-namespace Gtk
-{
-
-
-OptionMenu::OptionMenu()
-:
-  _CONSTRUCT()
-{
-  // Connect to the signal instead of overriding the on_hierarchy_changed()
-  // method because invocation of C++ default signal handlers is skipped
-  // for gtkmmproc-generated classes (a gtkmm-wide optimization).
-
-  signal_realize().connect(sigc::mem_fun(*this, &OptionMenu::init_accels_handler_));
-}
-
-OptionMenu::~OptionMenu()
-{
-  //GTKMM_LIFECYCLE
-  //Remove the menu so that the Menu forgets about this OptionMenu.
-  //Normally the GtkOptionMenu just destroys the Menu (see gtk_option_menu_destroy),
-  //but we prevent premature destruction in general for all widgets,
-  //so the Menu would survive and remember a dead GtkOptionMenu.
-  remove_menu();
-
-  destroy_();
-}
-
-void OptionMenu::init_accels_handler_()
-{
-  if(gobj())
-  {
-    Window *const toplevel = dynamic_cast<Window*>(get_toplevel());
-    if(toplevel && get_menu())
-    {
-      get_menu()->accelerate(*toplevel);
-    }
-  }
-}
-
-} /* namespace Gtk */
-
-
diff --git a/gtk/src/optionmenu.hg b/gtk/src/optionmenu.hg
deleted file mode 100644
index d70a70a..0000000
--- a/gtk/src/optionmenu.hg
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id: optionmenu.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* optionmenu.h
- * 
- * Copyright (C) 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-// This is for including the config header before any code (such as
-// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
-_CONFIGINCLUDE(gtkmmconfig.h)
-
-#include <gtkmm/button.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/button_p.h)
-
-namespace Gtk
-{
-
-class Menu;
-
-/** A widget used to choose from a list of valid choices.
- *
- * A Gtk::OptionMenu is a widget that allows the user to choose from a list
- * of valid choices. The Gtk::OptionMenu displays the selected choice. When
- * activated the GtkOptionMenu displays a popup Gtk::Menu which allows the
- * user to make a new choice. 
- *
- * @deprecated Use the ComboBox widget instead.
- */
-class OptionMenu : public Button
-{
-  _CLASS_GTKOBJECT(OptionMenu,GtkOptionMenu,GTK_OPTION_MENU,Gtk::Button,GtkButton)
-  _IS_DEPRECATED
-public:
-
-  OptionMenu();
-  _CUSTOM_DTOR()
-  
-  _WRAP_METHOD(void set_menu(Menu& menu), gtk_option_menu_set_menu)
-  _WRAP_METHOD(Menu* get_menu(), gtk_option_menu_get_menu)
-  _WRAP_METHOD(const Menu* get_menu() const, gtk_option_menu_get_menu, constversion)
-  _WRAP_METHOD(void remove_menu(), gtk_option_menu_remove_menu)
-  _WRAP_METHOD(int get_history() const, gtk_option_menu_get_history)
-  _WRAP_METHOD(void set_history(guint index), gtk_option_menu_set_history)
-
-  _WRAP_SIGNAL(void changed(), "changed")	
-
-private:
-  void init_accels_handler_();
-};
-
-} /* namespace Gtk */
-
diff --git a/gtk/src/progress.ccg b/gtk/src/progress.ccg
deleted file mode 100644
index 901ee27..0000000
--- a/gtk/src/progress.ccg
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- c++ -*-
-/* $Id: progress.ccg,v 1.1 2003/01/21 13:40:34 murrayc Exp $ */
-
-/* 
- *
- * Copyright 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
-
-
diff --git a/gtk/src/progress.hg b/gtk/src/progress.hg
deleted file mode 100644
index 421d0c0..0000000
--- a/gtk/src/progress.hg
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $Id: progress.hg,v 1.3 2005/11/29 16:38:10 murrayc Exp $ */
-
-/* progress.h
- * 
- * Copyright (C) 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-// This is for including the config header before any code (such as
-// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
-_CONFIGINCLUDE(gtkmmconfig.h)
-
-#if 0 /* deprecated */
-
-#include <gtkmm/widget.h>
-#include <gtkmm/adjustment.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/widget_p.h)
-
-
-namespace Gtk
-{
-
-class Adjustment;
-
-/** Abstract Progress Indicator
- *
- * @ingroup Widgets
- */
-class Progress : public Widget
-{
-  _CLASS_GTKOBJECT(Progress,GtkProgress,GTK_PROGRESS,Gtk::Widget,GtkWidget)
-  _IS_DEPRECATED
-  _IGNORE(gtk_progress_get_type, gtk_progress_set_show_text, gtk_progress_set_text_alignment, gtk_progress_set_format_string,
-          gtk_progress_set_adjustment, gtk_progress_configure, gtk_progress_set_percentage, gtk_progress_set_value,
-          gtk_progress_get_value, gtk_progress_set_activity_mode, gtk_progress_get_current_text, gtk_progress_get_text_from_value,
-          gtk_progress_get_current_percentage,gtk_progress_get_percentage_from_value)
-public:
-  _WRAP_PROPERTY("activity-mode", bool)
-  _WRAP_PROPERTY("show-text", bool)
-  _WRAP_PROPERTY("text-xalign", float)
-  _WRAP_PROPERTY("text-yalign", float)
-
-  _MEMBER_GET_PTR(adjustment, adjustment, Adjustment*, GtkAdjustment*)
-  _MEMBER_GET_GOBJECT(offscreen_pixmap, offscreen_pixmap, Gdk::Pixmap, GdkPixmap*)
-  _MEMBER_GET(format, format, Glib::ustring, gchar*)
-
-protected:
-  _WRAP_VFUNC(void paint(), paint)
-  _WRAP_VFUNC(void update(), update)
-  _WRAP_VFUNC(void act_mode_enter(), act_mode_enter)
-};
-
-} // namespace Gtk
-
-#endif /* #if 0 */
-
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 50db7af..82e6773 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
   
   //This is probably the same as Container::children().size(), which is deprecated anyway?
   //_MEMBER_GET(num_children, num_children, int, gint)
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 dc3138d..b6543d5 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)
@@ -53,7 +52,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)
@@ -127,23 +127,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 954962a..48e411e 100644
--- a/gtk/src/tooltip.hg
+++ b/gtk/src/tooltip.hg
@@ -28,9 +28,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.
  *
diff --git a/gtk/src/tooltips.ccg b/gtk/src/tooltips.ccg
deleted file mode 100644
index 4f24128..0000000
--- a/gtk/src/tooltips.ccg
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- c++ -*-
-/* $Id: tooltips.ccg,v 1.1 2003/01/21 13:40:46 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <gtk/gtk.h>
-#include <gdkmm/color.h>
-#include <gtkmm/widget.h>
-
-
-namespace Gtk
-{
-
-void Tooltips::set_tip(Gtk::Widget& widget, const Glib::ustring& tip_text)
-{
-  gtk_tooltips_set_tip(gobj(), widget.gobj(), tip_text.c_str(), 0);
-}
-
-void Tooltips::unset_tip(Gtk::Widget& widget)
-{
-  gtk_tooltips_set_tip(gobj(), widget.gobj(), 0, 0);
-}
-
-} // namespace Gtk
-
diff --git a/gtk/src/tooltips.hg b/gtk/src/tooltips.hg
deleted file mode 100644
index cf152c0..0000000
--- a/gtk/src/tooltips.hg
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Id: tooltips.hg,v 1.1 2003/01/21 13:40:46 murrayc Exp $ */
-
-/* Copyright (C) 1998-2002 The gtkmm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-// This is for including the config header before any code (such as
-// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
-_CONFIGINCLUDE(gtkmmconfig.h)
-
-#include <gdkmm/color.h>
-#include <gtkmm/object.h>
-_DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/object_p.h)
-
-typedef struct _GtkTooltipsData GtkTooltipsData;
-
-namespace Gtk
-{
-
-class Widget;
-
-/** Tooltips are the messages that appear next to a widget when the mouse
- * pointer is held over it for a short amount of time. They are especially
- * helpful for adding more verbose descriptions of things such as buttons
- * in a toolbar. 
- *
- * This widget holds tooltips for other widgets.  You should only need one
- * Tooltip widget for all widgets you wish to add tips to.
- * 
- * @deprecated Use the Gtk::Tooltip API instead.
- */
-class Tooltips : public Object
-{
-  _CLASS_GTKOBJECT(Tooltips,GtkTooltips,GTK_TOOLTIPS,Gtk::Object,GtkObject)
-  _IS_DEPRECATED
-  _IGNORE(gtk_tooltips_set_delay)
-public:
-  _CTOR_DEFAULT
-
-  _WRAP_METHOD(void enable(), gtk_tooltips_enable)
-  _WRAP_METHOD(void disable(), gtk_tooltips_disable)
-
-  _WRAP_METHOD(void set_tip(Widget& widget, const Glib::ustring& tip_text, const Glib::ustring& tip_private), gtk_tooltips_set_tip)
-  void set_tip(Widget& widget, const Glib::ustring& tip_text);
-  void unset_tip(Widget& widget);
-
-protected:
-  _WRAP_METHOD(static GtkTooltipsData* data_get(Widget& widget), gtk_tooltips_data_get)
-
-public:
-  _WRAP_METHOD(void force_window(),gtk_tooltips_force_window)
-};
-
-} //namespace Gtk
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]