[gtkmm/gtkmm-3-8: 1/2] Revert "Fix the build with --enable-warnings=fatal, partly."



commit 1ecc29edf3de965344d8a6a4df0c20e817a2361a
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri May 17 13:03:34 2013 +0200

    Revert "Fix the build with --enable-warnings=fatal, partly."
    
    This reverts commit ba0de9a629205bf2c0321a3241caa94a472ef82a.
    
    Conflicts:
        ChangeLog

 ChangeLog                                 |   20 --------------------
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 -
 2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 81a13b2..ed30ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,3 @@
-2013-05-07  Murray Cumming  <murrayc murray com>
-
-       Fix the build with --enable-warnings=fatal
-
-       * gdk/src/display.hg: Deprecate get_n_screens(), because the C function
-       is deprecated, because it always returns 1. Therefore also add a default
-       parameter value of 0 to get_screen().
-       Added a GDK_DISABLE_DEPRECATION_WARNINGS undef so we can still use
-       the deprecated API in our deprecated API.
-       * demos/gtk-demo/example_change_display.cc: Adapt this, like the 
-       C version has been adapted.
-
-2013-05-07  Murray Cumming  <murrayc murray com>
-
-       Fix the build with --enable-warnings=fatal, partly.
-
-       * tools/extra_defs_gen/generate_defs_gtk.cc: Add a define of
-       GDK_DISABLE_DEPRECATION_WARNINGS, though I do not know why this is only
-       necessary now, using GTK+ from git master.
-
 3.8.1:
 
 2013-04-29  Kjell Ahlstedt  <kjell ahlstedt bredband net>
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 60eacfb..d078eb5 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -25,7 +25,6 @@
 #undef GDK_PIXBUF_DISABLE_DEPRECATED
 #undef GDK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
 
 #include <glibmm_generate_extra_defs/generate_extra_defs.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>


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