[gtkmm] ScrolledWindow: Correct the get_v/hscrollbar() return types.



commit 2788269913eeb95fb55c5b280d9060b79cfd9ba4
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon May 2 11:45:37 2011 +0200

    ScrolledWindow: Correct the get_v/hscrollbar() return types.
    
    * gtk/src/scrolledwindow.hg: get_hscrollbar(), get_vscrollbar(): Return
    Scrollbar instead of HScrollbar or VScrollbar, as this is what the C API
    really returns. This is not really an API break because these could never
    have been used until now, because they always returned 0.
    Noticed by Andrew E. Makeev.

 ChangeLog                 |    9 +++++++++
 gtk/src/scrolledwindow.hg |   17 +++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 59ba446..822bd6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-02  Murray Cumming  <murrayc murrayc com>
+
+	ScrolledWindow: Correct the get_v/hscrollbar() return types.
+
+	* gtk/src/scrolledwindow.hg: get_hscrollbar(), get_vscrollbar(): Return
+	Scrollbar instead of HScrollbar or VScrollbar, as this is what the C API
+	really returns. This is not really an API break because these could never
+	have been used until now, because they always returned 0.
+
 3.0.0:
 
 2011-04-05  Murray Cumming  <murrayc murrayc com>
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index e84c58f..c362f0a 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -27,8 +27,7 @@ namespace Gtk
 {
 
 class Adjustment;
-class HScrollbar;
-class VScrollbar;
+class Scrollbar;
 
 /** Adds scrollbars to its child widget.
  *
@@ -78,15 +77,13 @@ public:
   virtual void add(Gtk::Widget& widget);
   _IGNORE(gtk_scrolled_window_add_with_viewport)
 
-#m4 _CONVERSION(`GtkWidget*',`VScrollbar*',`Glib::wrap((GtkVScrollbar*)$3)')
-#m4 _CONVERSION(`GtkWidget*',`const VScrollbar*',`Glib::wrap((GtkVScrollbar*)$3)')
-#m4 _CONVERSION(`GtkWidget*',`HScrollbar*',`Glib::wrap((GtkHScrollbar*)$3)')
-#m4 _CONVERSION(`GtkWidget*',`const HScrollbar*',`Glib::wrap((GtkHScrollbar*)$3)')
-  _WRAP_METHOD(VScrollbar* get_vscrollbar(), gtk_scrolled_window_get_vscrollbar)
-  _WRAP_METHOD(const VScrollbar* get_vscrollbar() const, gtk_scrolled_window_get_vscrollbar)
+#m4 _CONVERSION(`GtkWidget*',`Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
+#m4 _CONVERSION(`GtkWidget*',`const Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
+  _WRAP_METHOD(Scrollbar* get_vscrollbar(), gtk_scrolled_window_get_vscrollbar)
+  _WRAP_METHOD(const Scrollbar* get_vscrollbar() const, gtk_scrolled_window_get_vscrollbar)
 
-  _WRAP_METHOD(HScrollbar* get_hscrollbar(), gtk_scrolled_window_get_hscrollbar)
-  _WRAP_METHOD(const HScrollbar* get_hscrollbar() const, gtk_scrolled_window_get_hscrollbar)
+  _WRAP_METHOD(Scrollbar* get_hscrollbar(), gtk_scrolled_window_get_hscrollbar)
+  _WRAP_METHOD(const Scrollbar* get_hscrollbar() const, gtk_scrolled_window_get_hscrollbar)
 
   _WRAP_METHOD(int get_min_content_width() const, gtk_scrolled_window_get_min_content_width)
   _WRAP_METHOD(void set_min_content_width(int width), gtk_scrolled_window_set_min_content_width)



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