GNOME.org
 

[gtkmm] Use gtk+ 3.0 instead of gtk+ 2.0.

commit 95c133a4da9d035c1a2545d93c8c06f712a15225
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed May 12 12:17:07 2010 +0200

    Use gtk+ 3.0 instead of gtk+ 2.0.
    
    * configure.ac: Change the pkg-config check from gtk+-2.0 to gtk+-3.0.
        Change the gdkmm and gtkmm ABI version to 3.0, so people should change
        their pkg-config checks to gtkmm-3.0.
    * gtk/src/enums.hg: Remove GtkCurveType, which is not in gtk+ 3.0.
    * tools/extra_defs_gen/generate_defs_gtk.cc: Remove previously-deprecated
        types that are not in gtk+ 3.0.

 ChangeLog                                 |   11 +++++++
 configure.ac                              |   10 +++---
 gtk/src/enums.hg                          |   42 +++++++++++++---------------
 tools/extra_defs_gen/generate_defs_gtk.cc |   15 ----------
 4 files changed, 36 insertions(+), 42 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3e18432..3c0f255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-05-12  Murray Cumming  <murrayc murrayc com>
+
+    Use gtk+ 3.0 instead of gtk+ 2.0.
+
+	* configure.ac: Change the pkg-config check from gtk+-2.0 to gtk+-3.0.
+    Change the gdkmm and gtkmm ABI version to 3.0, so people should change
+    their pkg-config checks to gtkmm-3.0.
+	* gtk/src/enums.hg: Remove GtkCurveType, which is not in gtk+ 3.0.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Remove previously-deprecated
+    types that are not in gtk+ 3.0.
+
 2010-01-05  Murray Cumming  <murrayc murrayc com>
 
 	Remove more deprecated methods.
diff --git a/configure.ac b/configure.ac
index c217632..00fd597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gtkmm], [2.20.3],
+AC_INIT([gtkmm], [2.90.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -32,8 +32,8 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.8])
 MM_INIT_MODULE([atkmm-1.6])
-MM_INIT_MODULE([gdkmm-2.4])
-MM_INIT_MODULE([gtkmm-2.4])
+MM_INIT_MODULE([gdkmm-3.0])
+MM_INIT_MODULE([gtkmm-3.0])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([LIBGTKMM_SO_VERSION], [2:0:1])
@@ -56,11 +56,11 @@ AS_IF([test "x$enable_static" = xyes],
 AC_SUBST([ATKMM_MODULES], ['glibmm-2.4 >= 2.24 atk >= 1.12'])
 
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.24 pangomm-1.4 >= 2.26 gtk+-2.0 >= 2.20.0'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.22 pangomm-1.4 >= 2.26 gtk+-3.0 >= 2.90.0'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
-      [GTKMM_MODULES="$GDKMM_MODULES gtk+-unix-print-2.0"])
+      [GTKMM_MODULES="$GDKMM_MODULES gtk+-unix-print-3.0"])
 AC_SUBST([GTKMM_MODULES])
 
 PKG_CHECK_MODULES([ATKMM], [$ATKMM_MODULES])
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index e1f7c38..192a202 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -1,8 +1,8 @@
 /* $Id: enums.hg,v 1.5 2006/05/09 16:51:34 murrayc Exp $ */
 
 /* enums.h
- * 
- * Copyright (C) 2002 The gtkmm Development Team 
+ *
+ * Copyright (C) 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
@@ -67,7 +67,6 @@ _WRAP_ENUM(AttachOptions, GtkAttachOptions)
  */
 
 _WRAP_ENUM(ButtonBoxStyle, GtkButtonBoxStyle)
-_WRAP_ENUM(CurveType, GtkCurveType)
 _WRAP_ENUM(DeleteType, GtkDeleteType)
 _WRAP_ENUM(DirectionType, GtkDirectionType)
 _WRAP_ENUM(ExpanderStyle, GtkExpanderStyle)
@@ -144,31 +143,31 @@ public:
   // These static methods are implement in iconfactory.ccg. TODO: That's probably unnecessarily obscure. murrayc.
 
   /** Obtains the pixel size of a semantic icon size, possibly modified by user preferences for the default Gtk::Settings.
-   * Normally size would be Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_BUTTON, etc. 
-   * This function isn't normally needed because Gtk::Widget::render_icon() is the usual way to get an icon for 
-   * rendering - then just look at the size of the rendered pixbuf. The rendered pixbuf may not even correspond 
-   * to the width/height returned by IconSize::lookup(), because themes are free to render the pixbuf however they 
+   * Normally size would be Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_BUTTON, etc.
+   * This function isn't normally needed because Gtk::Widget::render_icon() is the usual way to get an icon for
+   * rendering - then just look at the size of the rendered pixbuf. The rendered pixbuf may not even correspond
+   * to the width/height returned by IconSize::lookup(), because themes are free to render the pixbuf however they
    * like, including changing the usual size.
    *
    * @param size An icon size.
-   * @param width Location to store icon width. 
+   * @param width Location to store icon width.
    * @param height Location to store icon height.
-   * @result true if size was a valid size. 
+   * @result true if size was a valid size.
    */
   static bool lookup(IconSize size, int& width, int& height);
 
-  /** Obtains the pixel size of a semantic icon size, possibly modified by user preferences for a particular 
-   * Gtk::Settings. Normally size would be Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_BUTTON, etc. 
-   * This function isn't normally needed because Gtk::Widget::render_icon() is the usual way to get an icon for 
-   * rendering - then just look at the size of the rendered pixbuf. The rendered pixbuf may not even correspond 
-   * to the width/height returned by IconSize::lookup(), because themes are free to render the pixbuf however they 
+  /** Obtains the pixel size of a semantic icon size, possibly modified by user preferences for a particular
+   * Gtk::Settings. Normally size would be Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_BUTTON, etc.
+   * This function isn't normally needed because Gtk::Widget::render_icon() is the usual way to get an icon for
+   * rendering - then just look at the size of the rendered pixbuf. The rendered pixbuf may not even correspond
+   * to the width/height returned by IconSize::lookup(), because themes are free to render the pixbuf however they
    * like, including changing the usual size.
    *
    * @param size An icon size.
-   * @param width Location to store icon width. 
+   * @param width Location to store icon width.
    * @param height Location to store icon height.
    * @param settings A Gtk::Settings object, used to determine which set of user preferences to used.
-   * @result true if size was a valid size. 
+   * @result true if size was a valid size.
    *
    * @newin{2,14}
    */
@@ -179,27 +178,27 @@ public:
    * @param	name Name of the icon size.
    * @param width The icon width.
    * @param height The icon height.
-   * @result Integer value representing the size. 
+   * @result Integer value representing the size.
    */
   static IconSize register_new(const Glib::ustring& name, int width, int height);
-  
+
   /** Registers @a alias as another name for @a target so calling from_name() with @a alias as argument will return @a target.
    *
    * @param alias An alias for target.
    * @param target An existing icon size.
    */
   static void register_alias(const Glib::ustring& alias, IconSize target);
-  
+
   /** Looks up the icon size associated with @a name.
    *
    * @param name the name to look up.
    * result The icon size with the given name.
    */
   static IconSize from_name(const Glib::ustring& name);
-  
+
   /** Gets the canonical name of the given icon size.
    *
-   * @param size size AnIconSize. 
+   * @param size size AnIconSize.
    * @result The name of the given icon size.
    */
   static Glib::ustring get_name(IconSize size);
@@ -243,4 +242,3 @@ float _gtkmm_align_float_from_enum(AlignmentEnum value);
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 } //namespace Gtk
-
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 46c7729..b44f67e 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -93,7 +93,6 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_CALENDAR )
             << get_defs( GTK_TYPE_CHECK_BUTTON )
             << get_defs( GTK_TYPE_CHECK_MENU_ITEM )
-            << get_defs( GTK_TYPE_CLIST ) /* Deprecated */
             << get_defs( GTK_TYPE_CELL_LAYOUT )
             << get_defs( GTK_TYPE_CELL_RENDERER )
             << get_defs( GTK_TYPE_CELL_RENDERER_ACCEL )
@@ -108,12 +107,9 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_CLIPBOARD )
             << get_defs( GTK_TYPE_COLOR_BUTTON )
             << get_defs( GTK_TYPE_COLOR_SELECTION )
-            << get_defs( GTK_TYPE_COMBO ) /* Deprecated */
             << get_defs( GTK_TYPE_COMBO_BOX )
             << get_defs( GTK_TYPE_CONTAINER )
-            << get_defs( GTK_TYPE_CTREE ) /* Deprecated */
             << get_defs( GTK_TYPE_CELL_VIEW )
-            << get_defs( GTK_TYPE_CURVE )
             << get_defs( GTK_TYPE_DIALOG )
             << get_defs( GTK_TYPE_DRAWING_AREA )
             << get_defs( GTK_TYPE_EDITABLE )
@@ -126,7 +122,6 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_FILE_CHOOSER_BUTTON )
             << get_defs( GTK_TYPE_FILE_CHOOSER_DIALOG )
             << get_defs( GTK_TYPE_FILE_CHOOSER_WIDGET )
-            << get_defs( GTK_TYPE_FILE_SELECTION ) /* Deprecated */
             << get_defs( GTK_TYPE_FIXED )
             << get_defs( GTK_TYPE_FONT_BUTTON )
             << get_defs( GTK_TYPE_FONT_SELECTION )
@@ -137,15 +132,12 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_IMAGE )
             << get_defs( GTK_TYPE_IMAGE_MENU_ITEM )
             << get_defs( GTK_TYPE_INFO_BAR )
-            << get_defs( GTK_TYPE_INPUT_DIALOG )
             << get_defs( GTK_TYPE_INVISIBLE )
             << get_defs( GTK_TYPE_ITEM )
             << get_defs( GTK_TYPE_ICON_VIEW )
             << get_defs( GTK_TYPE_LABEL )
             << get_defs( GTK_TYPE_LAYOUT )
             << get_defs( GTK_TYPE_LINK_BUTTON )
-            << get_defs( GTK_TYPE_LIST )
-            << get_defs( GTK_TYPE_LIST_ITEM )
             << get_defs( GTK_TYPE_MENU )
             << get_defs( GTK_TYPE_MENU_BAR )
             << get_defs( GTK_TYPE_MENU_ITEM )
@@ -156,15 +148,10 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_NOTEBOOK )
             << get_defs( GTK_TYPE_OBJECT )
             << get_defs( GTK_TYPE_OFFSCREEN_WINDOW )
-            << get_defs( GTK_TYPE_OPTION_MENU )
             << get_defs( GTK_TYPE_ORIENTABLE )
             << get_defs( GTK_TYPE_PANED )
-            << get_defs( GTK_TYPE_PIXMAP )
 #if !defined(G_OS_WIN32)
             << get_defs( GTK_TYPE_PLUG )
-#endif /* G_OS_WIN32 */
-            << get_defs( GTK_TYPE_PREVIEW )
-#if !defined(G_OS_WIN32)
             << get_defs( GTK_TYPE_PRINTER )
             << get_defs( GTK_TYPE_PRINT_JOB )
 #endif /* G_OS_WIN32 */
@@ -206,7 +193,6 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_STYLE )
             << get_defs( GTK_TYPE_TABLE )
             << get_defs( GTK_TYPE_TEAROFF_MENU_ITEM )
-            << get_defs( GTK_TYPE_TIPS_QUERY )
             << get_defs( GTK_TYPE_TOGGLE_BUTTON )
             << get_defs( GTK_TYPE_TOOLBAR )
             << get_defs( GTK_TYPE_TOOL_ITEM )
@@ -221,7 +207,6 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_TOGGLE_ACTION )
             << get_defs( GTK_TYPE_TOGGLE_TOOL_BUTTON )
             << get_defs( GTK_TYPE_TOOLTIP )
-            << get_defs( GTK_TYPE_TOOLTIPS )
             << get_defs( GTK_TYPE_TREE_SELECTION )
             << get_defs( GTK_TYPE_TREE_MODEL )
             << get_defs( GTK_TYPE_TREE_MODEL_FILTER )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]