[gtkmm] Gdk: Remove API which has been removed in gtk+-4

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 0a883de9eb6aa17eea1e33b0e4cf0a6b19388346
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Sun Nov 6 17:11:02 2016 +0100

    Gdk: Remove API which has been removed in gtk+-4
    
    Among other things, remove the deprecated Gdk::Color class. Bug #773642.

 gdk/gdkmm/general.cc    |    6 --
 gdk/gdkmm/general.h     |    1 -
 gdk/src/color.ccg       |  223 -----------------------------------------------
 gdk/src/color.hg        |  195 -----------------------------------------
 gdk/src/cursor.hg       |    1 -
 gdk/src/dragcontext.hg  |    1 -
 gdk/src/filelist.am     |    3 +-
 gdk/src/screen.hg       |   12 ---
 gdk/src/window.hg       |    1 -
 tools/m4/convert_gdk.m4 |   11 ---
 10 files changed, 1 insertions(+), 453 deletions(-)
---
diff --git a/gdk/gdkmm/general.cc b/gdk/gdkmm/general.cc
index 4c99059..47f65a4 100644
--- a/gdk/gdkmm/general.cc
+++ b/gdk/gdkmm/general.cc
@@ -15,13 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-//Allow use of deprecated API,
-//in the API that we also deprecate, but cannot remove yet:
-#undef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-
 #include <gdkmm/general.h>
-#include <gdkmm/color.h>
 #include <gdk/gdk.h>
 
 
diff --git a/gdk/gdkmm/general.h b/gdk/gdkmm/general.h
index 7d024d7..c590b9a 100644
--- a/gdk/gdkmm/general.h
+++ b/gdk/gdkmm/general.h
@@ -19,7 +19,6 @@
 #define _GDKMM_GENERAL_H
 
 #include <gdkmm/pixbuf.h>
-#include <gdkmm/color.h>
 #include <gdkmm/rectangle.h>
 #include <gdkmm/rgba.h>
 #include <cairomm/context.h>
diff --git a/gdk/src/cursor.hg b/gdk/src/cursor.hg
index e58c013..3768185 100644
--- a/gdk/src/cursor.hg
+++ b/gdk/src/cursor.hg
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gdkmm/color.h>
 #include <gdkmm/display.h>
 #include <gdkmm/pixbuf.h>
 
diff --git a/gdk/src/dragcontext.hg b/gdk/src/dragcontext.hg
index 3296cb7..9e637e5 100644
--- a/gdk/src/dragcontext.hg
+++ b/gdk/src/dragcontext.hg
@@ -18,7 +18,6 @@
 
 #include <vector>
 
-#include <gdkmm/color.h>
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/device.h>
 #include <glibmm/object.h>
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index 0cdff5c..29d2e3e 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -38,8 +38,7 @@ gdkmm_files_any_hg =          \
        visual.hg               \
        window.hg
 
-gdkmm_files_deprecated_hg = \
-       color.hg
+gdkmm_files_deprecated_hg =
 
 if DISABLE_DEPRECATED_API
 gdkmm_files_used_hg = $(gdkmm_files_any_hg)
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index 90caeaf..196ad66 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -42,23 +42,12 @@ class Screen : public Glib::Object
 protected:
 
 public:
-  _WRAP_METHOD(Glib::RefPtr<Visual> get_system_visual(), gdk_screen_get_system_visual, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Visual> get_system_visual() const, gdk_screen_get_system_visual, 
refreturn, constversion)
-
-  _WRAP_METHOD(Glib::RefPtr<Visual> get_rgba_visual(), gdk_screen_get_rgba_visual, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Visual> get_rgba_visual() const, gdk_screen_get_rgba_visual, refreturn, 
constversion)
-
-  _WRAP_METHOD(bool is_composited() const, gdk_screen_is_composited)
-
   _WRAP_METHOD(Glib::RefPtr<Window> get_root_window(), gdk_screen_get_root_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Window> get_root_window() const, gdk_screen_get_root_window, refreturn, 
constversion)
 
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_screen_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_screen_get_display, refreturn, 
constversion)
 
-#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Visual> >',`Glib::ListHandler< Glib::RefPtr<Visual> 
> ::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(std::vector< Glib::RefPtr<Visual> > list_visuals(), gdk_screen_list_visuals)
-
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Window> >',`Glib::ListHandler< Glib::RefPtr<Window> 
> ::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector< Glib::RefPtr<Window> > get_toplevel_windows(), gdk_screen_get_toplevel_windows)
 
@@ -73,7 +62,6 @@ public:
 
   //We use no_default_handler because GdkDisplayManagerClass is private.
 
-  _WRAP_SIGNAL(void composited_changed(), composited-changed, no_default_handler)
   _WRAP_SIGNAL(void monitors_changed(), monitors-changed, no_default_handler)
 
   _WRAP_PROPERTY("resolution", double)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 47a41e2..434fd35 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -104,7 +104,6 @@ public:
 
   _WRAP_METHOD(void focus(guint32 timestamp), gdk_window_focus)
   _WRAP_METHOD(void set_user_data(gpointer user_data), gdk_window_set_user_data)
-  _WRAP_METHOD(void set_override_redirect(bool override_redirect = true), gdk_window_set_override_redirect)
 
   //We could wrap these with a Slot instead of a C callback, but these methods are very low-level anyway.
   _WRAP_METHOD(void add_filter(GdkFilterFunc function, gpointer data), gdk_window_add_filter)
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index a34dc7b..cc505f5 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -89,21 +89,12 @@ _CONVERSION(`GdkRgbCmap&',`GdkRgbCmap*',`&$3',`*$3')
 _CONVERSION(`GdkKeymap*',`const GdkKeymap*',`$3')
 
 
-
-
-# for GtkStyle public struct members
-_CONVERSION(`Gdk::Color',`GdkColor', `(*($3).gobj())')
-_CONVERSION(`GdkColor',`Gdk::Color', `Gdk::Color(const_cast<GdkColor*>(&($3)), true)')
-
 # Ref (gdkmm) -> Ptr (gtk+)
-_CONVERSION(`Color&',`GdkColor*',($3).gobj())
-_CONVERSION(`const Gdk::Color&',`const GdkColor*',`($3).gobj()')
 _CONVERSION(`const RGBA&',`const GdkRGBA*',`($3).gobj()')
 _CONVERSION(`RGBA&',`GdkRGBA*',`($3).gobj()')
 _CONVERSION(`Gdk::RGBA&',`GdkRGBA*',`($3).gobj()')
 _CONVERSION(`const RGBA&',`GdkRGBA*',`const_cast<RGBA&>($3).gobj()')
 _CONVERSION(`const Gdk::RGBA&',`const GdkRGBA*',`($3).gobj()')
-_CONVERSION(`const Color&',`const GdkColor*',`($3).gobj()')
 _CONVERSION(`Rectangle&',`GdkRectangle*',($3).gobj())
 _CONVERSION(`Gdk::Rectangle&',`GdkRectangle*',($3).gobj())
 _CONVERSION(`const Rectangle&',`const GdkRectangle*',($3).gobj())
@@ -151,8 +142,6 @@ _CONVERSION(`const Glib::RefPtr<const Gdk::Screen>&',`GdkScreen*',__CONVERT_CONS
 
 define(`__CFR2P',`const_cast<$`'2>($`'3.gobj())')
 _CONVERSION(const Font&,GdkFont*,__CFR2P)
-_CONVERSION(const Gdk::Color&,GdkColor*,__CFR2P)
-_CONVERSION(const Color&,GdkColor*,__CFR2P)
 _CONVERSION(const Gdk::Rectangle&,GdkRectangle*,__CFR2P)
 _CONVERSION(const Rectangle&,GdkRectangle*,__CFR2P)
 _CONVERSION(const Geometry&,const GdkGeometry*,&($3))