[gtkmm] Deprecate all H* an V* classes in favour of the base classes.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Deprecate all H* an V* classes in favour of the base classes.
- Date: Sat, 11 Jun 2011 10:15:49 +0000 (UTC)
commit bddd15f5176b2e44339d3990447910ee77c803d1
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Jun 9 22:58:51 2011 +0200
Deprecate all H* an V* classes in favour of the base classes.
* gtk/src/box.hg:
* gtk/src/buttonbox.hg:
* gtk/src/paned.hg:
* gtk/src/scale.hg:
* gtk/src/scrollbar.hg:
* gtk/src/separator.hg: Deprecate all H* and V* classes.
We should now just use the base classes, setting the orientation
appropriately. This is indeed rather tedious.
This fixes the build with --enable-warnings=fatal.
ChangeLog | 18 ++++++++++++++++++
gtk/src/box.hg | 13 +++++++++----
gtk/src/buttonbox.hg | 10 ++++++++++
gtk/src/paned.hg | 9 +++++++++
gtk/src/scale.hg | 9 +++++++++
gtk/src/scrollbar.hg | 9 +++++++++
gtk/src/separator.hg | 8 +++++++-
7 files changed, 71 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b2c7e75..4a254d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-06-09 Murray Cumming <murrayc murrayc com>
+
+ Deprecate all H* an V* classes in favour of the base classes.
+
+ * gtk/src/box.hg:
+ * gtk/src/buttonbox.hg:
+ * gtk/src/paned.hg:
+ * gtk/src/scale.hg:
+ * gtk/src/scrollbar.hg:
+ * gtk/src/separator.hg: Deprecate all H* and V* classes.
+ We should now just use the base classes, setting the orientation
+ appropriately. This is indeed rather tedious.
+
+ This fixes the build with --enable-warnings=fatal.
+
+This is the master branch, for gtkmm 3.2, targetting GTK+ 3.2.
+See also the gtkmm-3-0 branch.
+
2011-06-03 Kalev Lember <kalev smartlink ee>
Updated the FSF address in license headers and COPYING file
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index 5098a2b..247dbd1 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -21,9 +21,7 @@ _DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-//Allow us to set the struct fields.
-//TODO: We probably need to remove the STL-style children() API.
-#undef GSEAL_ENABLE
+#undef GTK_DISABLE_DEPRECATED
#m4 _POP()
#include <gtkmm/container.h>
@@ -130,10 +128,14 @@ public:
*
* @ingroup Widgets
* @ingroup Containers
+ *
+ * @deprecated Use Box instead, which is a very quick and easy change. But we recommend switching to Grid, since
+ * Box will go away eventually.
*/
class VBox : public Box
{
_CLASS_GTKOBJECT(VBox,GtkVBox,GTK_VBOX,Gtk::Box,GtkBox)
+ _IS_DEPRECATED
public:
//TODO: Remove the homogoenous parameter as it was removed in gtk_box_new().
@@ -141,7 +143,6 @@ public:
* @param spacing Determines the space in pixels between child widgets.
*/
_WRAP_CTOR(VBox(bool homogeneous = false, int spacing = 0), gtk_vbox_new)
-
};
/** Horizontal Box for laying widgets in a horizontal row.
@@ -158,10 +159,14 @@ public:
*
* @ingroup Widgets
* @ingroup Containers
+ *
+ * @deprecated Use Box instead, which is a very quick and easy change. But we recommend switching to Grid, since
+ * Box will go away eventually.
*/
class HBox : public Box
{
_CLASS_GTKOBJECT(HBox,GtkHBox,GTK_HBOX,Gtk::Box,GtkBox)
+ _IS_DEPRECATED
public:
//TODO: Remove the homogoenous parameter as it was removed in gtk_box_new().
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index d134e5c..8e1f851 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -23,6 +23,10 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/box_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+
namespace Gtk
{
@@ -70,10 +74,13 @@ public:
*
* @ingroup Widgets
* @ingroup Containers
+ *
+ * @deprecated Use ButtonBox instead.
*/
class VButtonBox : public ButtonBox
{
_CLASS_GTKOBJECT(VButtonBox,GtkVButtonBox,GTK_VBUTTON_BOX,Gtk::ButtonBox,GtkButtonBox)
+ _IS_DEPRECATED
public:
explicit VButtonBox(ButtonBoxStyle layout = BUTTONBOX_EDGE, int spacing = BUTTONBOX_DEFAULT_SPACING);
};
@@ -92,10 +99,13 @@ public:
*
* @ingroup Widgets
* @ingroup Containers
+ *
+ * @deprecated Use ButtonBox instead.
*/
class HButtonBox : public ButtonBox
{
_CLASS_GTKOBJECT(HButtonBox,GtkHButtonBox,GTK_HBUTTON_BOX,Gtk::ButtonBox,GtkButtonBox)
+ _IS_DEPRECATED
public:
explicit HButtonBox(ButtonBoxStyle layout = BUTTONBOX_EDGE, int spacing = BUTTONBOX_DEFAULT_SPACING);
};
diff --git a/gtk/src/paned.hg b/gtk/src/paned.hg
index ee4b1b9..90b2f73 100644
--- a/gtk/src/paned.hg
+++ b/gtk/src/paned.hg
@@ -27,6 +27,9 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
namespace Gtk
{
@@ -112,10 +115,13 @@ public:
* user by dragging a handle. See Gtk::Paned for details.
*
* @ingroup Widgets
+ *
+ * @deprecated Use Paned instead.
*/
class HPaned : public Paned
{
_CLASS_GTKOBJECT(HPaned,GtkHPaned,GTK_HPANED,Gtk::Paned,GtkPaned)
+ _IS_DEPRECATED
public:
_CTOR_DEFAULT()
};
@@ -126,10 +132,13 @@ public:
* user by dragging a handle. See Gtk::Paned for details.
*
* @ingroup Widgets
+ *
+ * @deprecated Use Paned instead.
*/
class VPaned : public Paned
{
_CLASS_GTKOBJECT(VPaned,GtkVPaned,GTK_VPANED,Gtk::Paned,GtkPaned)
+ _IS_DEPRECATED
public:
_CTOR_DEFAULT()
diff --git a/gtk/src/scale.hg b/gtk/src/scale.hg
index c060100..368f951 100644
--- a/gtk/src/scale.hg
+++ b/gtk/src/scale.hg
@@ -25,6 +25,9 @@ _DEFS(gtkmm,gtk)
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/range_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
namespace Gtk
{
@@ -133,10 +136,13 @@ protected:
* @image html vscale1.png
*
* @ingroup Widgets
+ *
+ * @deprecated Use Scale instead.
*/
class VScale : public Scale
{
_CLASS_GTKOBJECT(VScale,GtkVScale,GTK_VSCALE,Gtk::Scale,GtkScale)
+ _IS_DEPRECATED
public:
VScale();
@@ -160,10 +166,13 @@ public:
* @image html hscale1.png
*
* @ingroup Widgets
+ *
+ * @deprecated Use Scale instead.
*/
class HScale : public Scale
{
_CLASS_GTKOBJECT(HScale,GtkHScale,GTK_HSCALE,Gtk::Scale,GtkScale)
+ _IS_DEPRECATED
public:
HScale();
/**
diff --git a/gtk/src/scrollbar.hg b/gtk/src/scrollbar.hg
index 067ea9e..fb4fef1 100644
--- a/gtk/src/scrollbar.hg
+++ b/gtk/src/scrollbar.hg
@@ -25,6 +25,9 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/range_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
namespace Gtk
{
@@ -71,10 +74,13 @@ public:
* @image html vscrollbar1.png
*
* @ingroup Widgets
+ *
+ * @deprecated Use Scrollbar instead.
*/
class VScrollbar : public Scrollbar
{
_CLASS_GTKOBJECT(VScrollbar,GtkVScrollbar,GTK_VSCROLLBAR,Gtk::Scrollbar,GtkScrollbar)
+ _IS_DEPRECATED
public:
VScrollbar();
explicit VScrollbar(const Glib::RefPtr<Adjustment>& gtkadjustment);
@@ -94,10 +100,13 @@ public:
* @image html hscrollbar1.png
*
* @ingroup Widgets
+ *
+ * @deprecated Use Scrollbar instead.
*/
class HScrollbar : public Scrollbar
{
_CLASS_GTKOBJECT(HScrollbar,GtkHScrollbar,GTK_HSCROLLBAR,Gtk::Scrollbar,GtkScrollbar)
+ _IS_DEPRECATED
public:
HScrollbar();
explicit HScrollbar(const Glib::RefPtr<Adjustment>& gtkadjustment);
diff --git a/gtk/src/separator.hg b/gtk/src/separator.hg
index b00cad8..4fb7406 100644
--- a/gtk/src/separator.hg
+++ b/gtk/src/separator.hg
@@ -25,6 +25,10 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/widget_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+
namespace Gtk
{
@@ -39,7 +43,7 @@ class Separator
_IMPLEMENTS_INTERFACE(Orientable)
public:
- //Note that we try to use the same defaul parameter value as the default property value.
+ //Note that we try to use the same default parameter value as the default property value.
_WRAP_CTOR(Separator(Orientation orientation = ORIENTATION_HORIZONTAL), gtk_separator_new)
};
@@ -56,6 +60,7 @@ public:
class VSeparator : public Separator
{
_CLASS_GTKOBJECT(VSeparator,GtkVSeparator,GTK_VSEPARATOR,Gtk::Separator,GtkSeparator)
+ _IS_DEPRECATED
public:
_CTOR_DEFAULT
@@ -75,6 +80,7 @@ public:
class HSeparator : public Separator
{
_CLASS_GTKOBJECT(HSeparator,GtkHSeparator,GTK_HSEPARATOR,Gtk::Separator,GtkSeparator)
+ _IS_DEPRECATED
public:
_CTOR_DEFAULT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]