GNOME.org
 

[gtkmm/removegdkcolor] Remove most API that uses Gdk::Color.

commit 4622dee6bd636118779218dde6e76c281bc696ee
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 13 15:12:53 2011 +0100

    Remove most API that uses Gdk::Color.
    
    	* gtk/src/cellrenderer.hg:
    	* gtk/src/cellrenderertext.hg:
    	* gtk/src/cellview.hg:
    	* gtk/src/colorbutton.ccg:
    	* gtk/src/colorbutton.hg:
    	* gtk/src/colorselection.ccg:
    	* gtk/src/colorselection.hg:
    	* gtk/src/settings.hg: Remove methods and properties that use Gdk::Color,
    	because TextTag is the only class that does not yet have RGBA equivalents.

 ChangeLog                   |   14 ++++++++++++++
 gtk/src/cellrenderer.hg     |    2 +-
 gtk/src/cellrenderertext.hg |    4 ++--
 gtk/src/cellview.hg         |    6 +++---
 gtk/src/colorbutton.ccg     |    7 -------
 gtk/src/colorbutton.hg      |   29 +++++++----------------------
 gtk/src/colorselection.ccg  |   14 --------------
 gtk/src/colorselection.hg   |   16 +++++++++++-----
 gtk/src/settings.hg         |    2 +-
 9 files changed, 39 insertions(+), 55 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 528b17d..09002bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-01-13  Murray Cumming  <murrayc murrayc com>
 
+	Remove most API that uses Gdk::Color.
+
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/cellrenderertext.hg:
+	* gtk/src/cellview.hg:
+	* gtk/src/colorbutton.ccg:
+	* gtk/src/colorbutton.hg:
+	* gtk/src/colorselection.ccg:
+	* gtk/src/colorselection.hg:
+	* gtk/src/settings.hg: Remove methods and properties that use Gdk::Color, 
+	because TextTag is the only class that does not yet have RGBA equivalents.
+
+2011-01-13  Murray Cumming  <murrayc murrayc com>
+
 	Documentation: Remove mentions of Pixmap.
 
 	* gdk/src/window.hg: Remove declaration of set_icon(pixmap), which had 
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 29df206..ad70469 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -145,7 +145,7 @@ public:
   _WRAP_PROPERTY("is-expander", bool)
   _WRAP_PROPERTY("is-expanded", bool)
   _WRAP_PROPERTY("cell-background", Glib::ustring)
-  _WRAP_PROPERTY("cell-background-gdk", Gdk::Color)
+  //GdkColor is semi-deprecated: _WRAP_PROPERTY("cell-background-gdk", Gdk::Color)
   _WRAP_PROPERTY("cell-background-rgba", Gdk::RGBA)
   _WRAP_PROPERTY("cell-background-set", bool)
   _WRAP_PROPERTY("editing", bool)
diff --git a/gtk/src/cellrenderertext.hg b/gtk/src/cellrenderertext.hg
index 975fa30..273e807 100644
--- a/gtk/src/cellrenderertext.hg
+++ b/gtk/src/cellrenderertext.hg
@@ -47,8 +47,8 @@ public:
   _WRAP_PROPERTY("attributes", Pango::AttrList)
   _WRAP_PROPERTY("background", Glib::ustring)
   _WRAP_PROPERTY("foreground", Glib::ustring)
-  _WRAP_PROPERTY("background-gdk", Gdk::Color)
-  _WRAP_PROPERTY("foreground-gdk", Gdk::Color)
+  //GdkColor is semi-deprecated: _WRAP_PROPERTY("background-gdk", Gdk::Color)
+  //GdkColor is semi-deprecated: _WRAP_PROPERTY("foreground-gdk", Gdk::Color)
   _WRAP_PROPERTY("background-rgba", Gdk::RGBA)
   _WRAP_PROPERTY("foreground-rgba", Gdk::RGBA)
   _WRAP_PROPERTY("font", Glib::ustring)
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index 370a4bb..0cadad0 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -85,13 +85,13 @@ public:
   _WRAP_METHOD(TreeModel::Path get_displayed_row() const, gtk_cell_view_get_displayed_row)
   _IGNORE(gtk_cell_view_get_size_of_row) //deprecated
 
-  _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color)
-  _WRAP_METHOD(void set_background_rgba(const Gdk::RGBA& rgba), gtk_cell_view_set_background_rgba)
+  //GdkColor is semi-deprecated.
+  _IGNORE(gtk_cell_view_set_background_color, gtk_cell_view_set_background_rgba)
 
   _IGNORE(gtk_cell_view_get_cell_renderers) //deprecated
 
   _WRAP_PROPERTY("background", Glib::ustring)
-  _WRAP_PROPERTY("background-gdk", Gdk::Color)
+  //GdkColor is semi-deprecated: _WRAP_PROPERTY("background-gdk", Gdk::Color)
   _WRAP_PROPERTY("background-rgba", Gdk::RGBA)
   _WRAP_PROPERTY("background-set", bool)
   _WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
diff --git a/gtk/src/colorbutton.ccg b/gtk/src/colorbutton.ccg
index 2aba272..0254aba 100644
--- a/gtk/src/colorbutton.ccg
+++ b/gtk/src/colorbutton.ccg
@@ -26,13 +26,6 @@
 namespace Gtk
 {
 
-Gdk::Color ColorButton::get_color() const
-{
-  Gdk::Color color;
-  gtk_color_button_get_color(const_cast<GtkColorButton*>(gobj()), color.gobj());
-  return color;
-}
-
 Gdk::RGBA ColorButton::get_rgba() const
 {
   Gdk::RGBA color;
diff --git a/gtk/src/colorbutton.hg b/gtk/src/colorbutton.hg
index 7b0c812..6e04af9 100644
--- a/gtk/src/colorbutton.hg
+++ b/gtk/src/colorbutton.hg
@@ -57,17 +57,8 @@ public:
   _CTOR_DEFAULT()
   _IGNORE(gtk_color_button_new)
 
-  /** Creates a new color button with a predefined color.
-   *
-   * Same as Gtk::ColorButton::ColorButton(). Additionally takes a Gdk::Color and
-   * initializes the button with this color. Equivalent to calling set_color(@a color)
-   * after the default constructor.
-   *
-   * @param color A Gdk::Color to set the current color with.
-   *
-   * @newin{2,4}
-   */
-  _WRAP_CTOR(ColorButton(const Gdk::Color& color), gtk_color_button_new_with_color)
+  //GdkColor is semi-deprecated.
+  _IGNORE(gtk_color_button_new_with_color)
 
   /** Creates a new color button with a predefined color.
    *
@@ -81,19 +72,13 @@ public:
    */
   _WRAP_CTOR(ColorButton(const Gdk::RGBA& rgba), gtk_color_button_new_with_rgba)
 
-  _WRAP_METHOD(void set_color(const Gdk::Color& color), gtk_color_button_set_color)
+  //GdkColor is semi-deprecated.
+  _IGNORE(gtk_color_button_set_color)
+
   _WRAP_METHOD(void set_alpha(guint16 alpha), gtk_color_button_set_alpha)
   _WRAP_METHOD(void set_rgba(const Gdk::RGBA& color), gtk_color_button_set_rgba)
 
-  /** Returns a copy of the the current color.
-   *
-   * Changes to the return value will have no effect on the Gtk::ColorButton.
-   *
-   * @return A Gdk::Color representing the current internal color of the Gtk::ColorButton.
-   *
-   * @newin{2,4}
-   */
-  Gdk::Color get_color() const;
+  //GdkColor is semi-deprecated.
   _IGNORE(gtk_color_button_get_color)
 
   /** Returns a copy of the the current color.
@@ -115,7 +100,7 @@ public:
 
   _WRAP_PROPERTY("use-alpha", bool)
   _WRAP_PROPERTY("title", Glib::ustring)
-  _WRAP_PROPERTY("color", Gdk::Color)
+  //GdkColor is semi-deprecated. _WRAP_PROPERTY("color", Gdk::Color)
   _WRAP_PROPERTY("rgba", Gdk::RGBA)
   _WRAP_PROPERTY("alpha", guint16) //Todo: Remove thsi when we remove the "color" property too.
 
diff --git a/gtk/src/colorselection.ccg b/gtk/src/colorselection.ccg
index a4bf3c3..b9b069a 100644
--- a/gtk/src/colorselection.ccg
+++ b/gtk/src/colorselection.ccg
@@ -57,20 +57,6 @@ static void old_change_palette_hook_callback(const Glib::RefPtr<Gdk::Screen>& sc
 namespace Gtk
 {
 
-Gdk::Color ColorSelection::get_current_color() const
-{
-  Gdk::Color color; //GdkColor Just a simple struct.
-  gtk_color_selection_get_current_color(const_cast<GtkColorSelection*>(gobj()), color.gobj());
-  return color;
-}
-
-Gdk::Color ColorSelection::get_previous_color() const
-{
-  Gdk::Color color; //GdkColor Just a simple struct.
-  gtk_color_selection_get_previous_color(const_cast<GtkColorSelection*>(gobj()), color.gobj());
-  return color;
-}
-
 Gdk::RGBA ColorSelection::get_current_rgba() const
 {
   Gdk::RGBA color; //GdkRGBA is just a simple struct.
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index 5f19577..7980110 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -51,13 +51,19 @@ public:
   _WRAP_METHOD(void set_has_opacity_control(bool has_opacity = true), gtk_color_selection_set_has_opacity_control)
   _WRAP_METHOD(bool get_has_palette() const, gtk_color_selection_get_has_palette)
   _WRAP_METHOD(void set_has_palette(bool has_palette = true), gtk_color_selection_set_has_palette)
-  _WRAP_METHOD(void set_current_color(const Gdk::Color& color), gtk_color_selection_set_current_color)
+
+  //GdkColor is semi-deprecated.
+  _IGNORE(gtk_color_selection_set_current_color)
+
   _WRAP_METHOD(void set_current_alpha(guint16 alpha), gtk_color_selection_set_current_alpha)
-  Gdk::Color get_current_color() const;
+
   _WRAP_METHOD(guint16 get_current_alpha() const, gtk_color_selection_get_current_alpha)
-  _WRAP_METHOD(void set_previous_color(const Gdk::Color& color), gtk_color_selection_set_previous_color)
+
+  //GdkColor is semi-deprecated.
+  _IGNORE(gtk_color_selection_set_previous_color)
+
   _WRAP_METHOD(void set_previous_alpha(guint16 alpha), gtk_color_selection_set_previous_alpha)
-  Gdk::Color get_previous_color() const;
+
   _WRAP_METHOD(guint16 get_previous_alpha() const, gtk_color_selection_get_previous_alpha)
   
   
@@ -81,7 +87,7 @@ public:
 
   _WRAP_PROPERTY("has-palette", bool)
   _WRAP_PROPERTY("has-opacity-control", bool)
-  _WRAP_PROPERTY("current-color", Gdk::Color)
+  //GdkColor is semi-deprecated: _WRAP_PROPERTY("current-color", Gdk::Color)
   _WRAP_PROPERTY("current-alpha", guint)
 };
 
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index 4de0553..3eff746 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -81,7 +81,7 @@ public:
   _WRAP_PROPERTY("gtk-keynav-cursor-only", bool)
   _WRAP_PROPERTY("gtk-keynav-wrap-around", bool)
   _WRAP_PROPERTY("gtk-error-bell", bool)
-  _WRAP_PROPERTY("color-hash", Gdk::Color) //This is really a hash table.
+  //GdkColor is semi-deprecated. _WRAP_PROPERTY("color-hash", Gdk::Color) //This is really a hash table.
   _WRAP_PROPERTY("gtk-file-chooser-backend", Glib::ustring)
   _WRAP_PROPERTY("gtk-print-backends", Glib::ustring)
   _WRAP_PROPERTY("gtk-print-preview-command", Glib::ustring)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]