[gtkmm] Moved HScrollbar and VScrollbar to separate files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Moved HScrollbar and VScrollbar to separate files.
- Date: Mon, 13 Jun 2011 19:53:22 +0000 (UTC)
commit fffee6b3f14f72e141cff5678050b74a79e077a0
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jun 13 21:53:17 2011 +0200
Moved HScrollbar and VScrollbar to separate files.
* gtk/src/scrollbar.[hg|ccg]:
* gtk/src/hvscrollbar.[hg|ccg]: See the prevous commit about Box
and others. I forgot to do it for this one too.
* gtk/gtkmm.h: Mention the new header.
* gtk/src/filelist.am: Mention the new files.
ChangeLog | 10 ++++++++
gtk/gtkmm.h | 1 +
gtk/src/filelist.am | 1 +
gtk/src/scrollbar.ccg | 31 --------------------------
gtk/src/scrollbar.hg | 57 ++++--------------------------------------------
5 files changed, 17 insertions(+), 83 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8c52636..e2b2d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2011-06-13 Murray Cumming <murrayc murrayc com>
+ Moved HScrollbar and VScrollbar to separate files.
+
+ * gtk/src/scrollbar.[hg|ccg]:
+ * gtk/src/hvscrollbar.[hg|ccg]: See the prevous commit about Box
+ and others. I forgot to do it for this one too.
+ * gtk/gtkmm.h: Mention the new header.
+ * gtk/src/filelist.am: Mention the new files.
+
+2011-06-13 Murray Cumming <murrayc murrayc com>
+
Dialog: Deprecate get_vbox(), replacing with get_content_area().
* gtk/src/dialog.hg: We forgot to rename get_vbox() to
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index a23491a..d9f1019 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -154,6 +154,7 @@ extern const int gtkmm_micro_version;
#include <gtkmm/hvbuttonbox.h>
#include <gtkmm/hvpaned.h>
#include <gtkmm/hvscale.h>
+#include <gtkmm/hvscrollbar.h>
#include <gtkmm/hvseparator.h>
#include <gtkmm/iconset.h>
#include <gtkmm/iconfactory.h>
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 7d4edb4..dde0343 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -201,6 +201,7 @@ gtkmm_files_deprecated_hg = hvbox.hg \
hvbuttonbox.hg \
hvpaned.hg \
hvscale.hg \
+ hvscrollbar.hg \
hvseparator.hg
if HOST_WINDOWS_NATIVE
diff --git a/gtk/src/scrollbar.ccg b/gtk/src/scrollbar.ccg
index a91a484..39658f0 100644
--- a/gtk/src/scrollbar.ccg
+++ b/gtk/src/scrollbar.ccg
@@ -33,35 +33,4 @@ _CONSTRUCT_SPECIFIC(Range, Scrollbar, "adjustment", Glib::unwrap(adjustment), "o
{
}
-VScrollbar::VScrollbar(const Glib::RefPtr<Adjustment>& adjustment)
-:
- _CONSTRUCT_SPECIFIC(Scrollbar, VScrollbar)
-{
- set_adjustment(adjustment);
-}
-
-VScrollbar::VScrollbar()
-:
- _CONSTRUCT_SPECIFIC(Scrollbar, VScrollbar)
-{
- Glib::RefPtr<Adjustment> adjustment = Adjustment::create(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
- set_adjustment(adjustment);
-}
-
-
-HScrollbar::HScrollbar()
-:
- _CONSTRUCT_SPECIFIC(Scrollbar, HScrollbar)
-{
- Glib::RefPtr<Adjustment> adjustment = Adjustment::create(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
- set_adjustment(adjustment);
-}
-
-HScrollbar::HScrollbar(const Glib::RefPtr<Adjustment>& adjustment)
-:
- _CONSTRUCT_SPECIFIC(Scrollbar, HScrollbar)
-{
- set_adjustment(adjustment);
-}
-
} // namespace Gtk
diff --git a/gtk/src/scrollbar.hg b/gtk/src/scrollbar.hg
index fb4fef1..5a8c933 100644
--- a/gtk/src/scrollbar.hg
+++ b/gtk/src/scrollbar.hg
@@ -61,58 +61,11 @@ public:
};
-/** A vertical scrollbar.
- *
- * The Gtk::VScrollbar widget is a widget arranged vertically creating a
- * scrollbar. See Gtk::Scrollbar for details on scrollbars.
- *
- * A Gtk::Adjustment may may be passed to the constructor to handle the
- * adjustment of the scrollbar. If not specified, one will be created for
- * you. See Gtk::Adjustment for details.
- *
- * A VScrollbar widget looks like this:
- * @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);
-
-};
-
-/** A horizontal scrollbar.
- *
- * The Gtk::HScrollbar widget is a widget arranged horizontally creating a
- * scrollbar. See Gtk::Scrollbar for details on scrollbars.
- *
- * A Gtk::Adjustment may may be passed to the constructor to handle the
- * adjustment of the scrollbar. If not specified, one will be created for
- * you. See Gtk::Adjustment for details.
- *
- * The HScrollbar widget looks like this:
- * @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);
-
-};
+} /* namespace Gtk */
-} /* namespace Gtk */
+//Include the deprecated header,
+//whose classes were previously in this header,
+//to preserve the "API" of the includes.
+#include <gtkmm/hvscrollbar.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]