gtkmm r1007 - in branches/gtkmm-2-12: . examples/book/frame gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Jul 16 15:55:33 2008
New Revision: 1007
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1007&view=rev

Log:
2008-07-16  Murray Cumming  <murrayc murrayc com>

* gtk/src/filechooser.hg: get_preview_widget(): Move the const 
overload after the non-const one, because gmmproc otherwise seems to 
make both just calls to the non-const one. We really need to stop 
gmmproc from doing that, first figuring out why.
Luckily, I don't think we put them in this order very often.
Bug #543288 (Jens Georg)

Modified:
   branches/gtkmm-2-12/ChangeLog
   branches/gtkmm-2-12/examples/book/frame/examplewindow.cc
   branches/gtkmm-2-12/gtk/src/filechooser.hg

Modified: branches/gtkmm-2-12/examples/book/frame/examplewindow.cc
==============================================================================
--- branches/gtkmm-2-12/examples/book/frame/examplewindow.cc	(original)
+++ branches/gtkmm-2-12/examples/book/frame/examplewindow.cc	Wed Jul 16 15:55:33 2008
@@ -30,7 +30,8 @@
   add(m_Frame);
 
   /* Set the frames label */
-  m_Frame.set_label("Gtk::Frame Widget");
+  Gtk::Button* label_widget = Gtk::manage(new Gtk::Button("button title"));
+  m_Frame.set_label_widget(*label_widget);
 
   /* Align the label at the right of the frame */
   //m_Frame.set_label_align(Gtk::ALIGN_RIGHT, Gtk::ALIGN_TOP);

Modified: branches/gtkmm-2-12/gtk/src/filechooser.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/filechooser.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/filechooser.hg	Wed Jul 16 15:55:33 2008
@@ -116,8 +116,10 @@
 /* Preview widget
  */
   _WRAP_METHOD(void set_preview_widget(Gtk::Widget& preview_widget), gtk_file_chooser_set_preview_widget)
-  _WRAP_METHOD(const Gtk::Widget* get_preview_widget() const, gtk_file_chooser_get_preview_widget, constversion)
+ 
   _WRAP_METHOD(Gtk::Widget* get_preview_widget(), gtk_file_chooser_get_preview_widget)
+  _WRAP_METHOD(const Gtk::Widget* get_preview_widget() const, gtk_file_chooser_get_preview_widget, constversion)
+
   _WRAP_METHOD(void set_preview_widget_active(bool active = true), gtk_file_chooser_set_preview_widget_active)
   _WRAP_METHOD(bool get_preview_widget_active() const, gtk_file_chooser_get_preview_widget_active)