GNOME.org
 

[gtkmm-documentation] C++11: Use the override keyword.

commit 075b4e9f8fa5d225940e8a04d1cda0f7557df5e7
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jul 23 11:26:42 2015 +0200

    C++11: Use the override keyword.
    
    This showed that some custom cellrenderers in others/ have
    gtkmm2-style vfuncs that are not actually overriding anything any more.
    They need to be ported properly to gtkmm3 still.

 .../app_and_win_menus/exampleapplication.h         |    4 +-
 .../command_line_handling/exampleapplication.h     |    8 +++---
 .../book/application/simple/exampleapplication.h   |    6 ++--
 .../book/custom/custom_container/mycontainer.h     |   24 +++++++++---------
 examples/book/custom/custom_widget/mywidget.h      |   22 ++++++++--------
 examples/book/drawingarea/arcs/myarea.h            |    2 +-
 examples/book/drawingarea/clock/clock.h            |    2 +-
 examples/book/drawingarea/curve/myarea.h           |    2 +-
 examples/book/drawingarea/image/myarea.h           |    2 +-
 examples/book/drawingarea/joins/myarea.h           |    2 +-
 examples/book/drawingarea/pango_text/myarea.h      |    2 +-
 examples/book/drawingarea/simple/myarea.h          |    2 +-
 examples/book/drawingarea/thin_lines/myarea.h      |    2 +-
 .../keyboard_events/propagation/examplewindow.h    |    2 +-
 .../book/keyboard_events/simple/examplewindow.h    |    2 +-
 examples/book/menus/main_menu/exampleapplication.h |    4 +-
 examples/book/menus/popup/examplewindow.h          |    3 +-
 examples/book/printing/advanced/previewdialog.h    |    3 +-
 .../book/printing/advanced/printformoperation.h    |   10 ++++----
 examples/book/printing/simple/printformoperation.h |    4 +-
 examples/book/toolpalette/canvas.h                 |   12 ++++----
 .../book/treeview/drag_and_drop/treemodel_dnd.h    |    4 +-
 examples/book/treeview/popup/treeview_withpopup.h  |    2 +-
 .../others/cellrenderercustom/cellrendererlist.h   |    2 +-
 .../others/cellrenderercustom/cellrendererpopup.h  |    8 +++---
 .../cellrenderercustom/cellrenderertoggle.cc       |   13 +++++----
 examples/others/cellrenderercustom/popupentry.h    |    4 +-
 examples/others/treemodelcustom/exampletreemodel.h |   26 ++++++++++----------
 examples/others/window/wheelbarrow.cc              |    2 +-
 29 files changed, 92 insertions(+), 89 deletions(-)
---
diff --git a/examples/book/application/app_and_win_menus/exampleapplication.h 
b/examples/book/application/app_and_win_menus/exampleapplication.h
index c8b6bd9..d639906 100644
--- a/examples/book/application/app_and_win_menus/exampleapplication.h
+++ b/examples/book/application/app_and_win_menus/exampleapplication.h
@@ -29,8 +29,8 @@ public:
     
 protected:
   //Overrides of default signal handlers:
-  virtual void on_activate();
-  virtual void on_startup();
+  void on_activate() override;
+  void on_startup() override;
 
 private:
   void create_window();
diff --git a/examples/book/application/command_line_handling/exampleapplication.h 
b/examples/book/application/command_line_handling/exampleapplication.h
index 9ad3678..8302cf2 100644
--- a/examples/book/application/command_line_handling/exampleapplication.h
+++ b/examples/book/application/command_line_handling/exampleapplication.h
@@ -29,10 +29,10 @@ public:
     
 protected:
   //Overrides of default signal handlers:
-  virtual void on_activate();
-  virtual void on_open(const Gio::Application::type_vec_files& files,
-    const Glib::ustring& hint);
-  virtual int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line);
+  void on_activate()  override;
+  void on_open(const Gio::Application::type_vec_files& files,
+    const Glib::ustring& hint) override;
+  int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line) override;
 
   //A regular signal handler, because there is no default signal handler for this:
   int on_handle_local_options(const Glib::RefPtr<Glib::VariantDict>& options);
diff --git a/examples/book/application/simple/exampleapplication.h 
b/examples/book/application/simple/exampleapplication.h
index f8e1b0d..aa508fb 100644
--- a/examples/book/application/simple/exampleapplication.h
+++ b/examples/book/application/simple/exampleapplication.h
@@ -29,9 +29,9 @@ public:
     
 protected:
   //Overrides of default signal handlers:
-  virtual void on_activate();
-  virtual void on_open(const Gio::Application::type_vec_files& files,
-    const Glib::ustring& hint);
+  void on_activate() override;
+  void on_open(const Gio::Application::type_vec_files& files,
+    const Glib::ustring& hint) override;
 
 private:
   void create_window(const Glib::RefPtr<Gio::File>& file = Glib::RefPtr<Gio::File>());
diff --git a/examples/book/custom/custom_container/mycontainer.h 
b/examples/book/custom/custom_container/mycontainer.h
index acc9b31..faac1e9 100644
--- a/examples/book/custom/custom_container/mycontainer.h
+++ b/examples/book/custom/custom_container/mycontainer.h
@@ -32,18 +32,18 @@ public:
 protected:
 
   //Overrides:
-  virtual Gtk::SizeRequestMode get_request_mode_vfunc() const;
-  virtual void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const;
-  virtual void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) 
const;
-  virtual void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const;
-  virtual void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) 
const;
-  virtual void on_size_allocate(Gtk::Allocation& allocation);
-
-  virtual void forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data);
-
-  virtual void on_add(Gtk::Widget* child);
-  virtual void on_remove(Gtk::Widget* child);
-  virtual GType child_type_vfunc() const;
+  Gtk::SizeRequestMode get_request_mode_vfunc() const override;
+  void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const override;
+  void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const 
override;
+  void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const override;
+  void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const 
override;
+  void on_size_allocate(Gtk::Allocation& allocation) override;
+
+  void forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data) override;
+
+  void on_add(Gtk::Widget* child) override;
+  void on_remove(Gtk::Widget* child) override;
+  GType child_type_vfunc() const override;
 
   Gtk::Widget* m_child_one;
   Gtk::Widget* m_child_two;
diff --git a/examples/book/custom/custom_widget/mywidget.h b/examples/book/custom/custom_widget/mywidget.h
index e6f79e8..6fd6d1a 100644
--- a/examples/book/custom/custom_widget/mywidget.h
+++ b/examples/book/custom/custom_widget/mywidget.h
@@ -30,17 +30,17 @@ public:
 protected:
 
   //Overrides:
-  virtual Gtk::SizeRequestMode get_request_mode_vfunc() const;
-  virtual void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const;
-  virtual void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) 
const;
-  virtual void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const;
-  virtual void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) 
const;
-  virtual void on_size_allocate(Gtk::Allocation& allocation);
-  virtual void on_map();
-  virtual void on_unmap();
-  virtual void on_realize();
-  virtual void on_unrealize();
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  Gtk::SizeRequestMode get_request_mode_vfunc() const override;
+  void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const override;
+  void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const  
override;
+  void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const override;
+  void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const 
override;
+  void on_size_allocate(Gtk::Allocation& allocation) override;
+  void on_map() override;
+  void on_unmap() override;
+  void on_realize() override;
+  void on_unrealize() override;
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
   //Signal handler:
   void on_parsing_error(const Glib::RefPtr<const Gtk::CssSection>& section, const Glib::Error& error);
diff --git a/examples/book/drawingarea/arcs/myarea.h b/examples/book/drawingarea/arcs/myarea.h
index 3bbc877..7642930 100644
--- a/examples/book/drawingarea/arcs/myarea.h
+++ b/examples/book/drawingarea/arcs/myarea.h
@@ -29,7 +29,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 };
 
 #endif // GTKMM_EXAMPLE_MYAREA_H
diff --git a/examples/book/drawingarea/clock/clock.h b/examples/book/drawingarea/clock/clock.h
index 374bba4..3764ef4 100644
--- a/examples/book/drawingarea/clock/clock.h
+++ b/examples/book/drawingarea/clock/clock.h
@@ -29,7 +29,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
   bool on_timeout();
 
diff --git a/examples/book/drawingarea/curve/myarea.h b/examples/book/drawingarea/curve/myarea.h
index 3bbc877..7642930 100644
--- a/examples/book/drawingarea/curve/myarea.h
+++ b/examples/book/drawingarea/curve/myarea.h
@@ -29,7 +29,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 };
 
 #endif // GTKMM_EXAMPLE_MYAREA_H
diff --git a/examples/book/drawingarea/image/myarea.h b/examples/book/drawingarea/image/myarea.h
index 057345b..9f12545 100644
--- a/examples/book/drawingarea/image/myarea.h
+++ b/examples/book/drawingarea/image/myarea.h
@@ -28,7 +28,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
   Glib::RefPtr<Gdk::Pixbuf> m_image;
 };
diff --git a/examples/book/drawingarea/joins/myarea.h b/examples/book/drawingarea/joins/myarea.h
index 3bbc877..7642930 100644
--- a/examples/book/drawingarea/joins/myarea.h
+++ b/examples/book/drawingarea/joins/myarea.h
@@ -29,7 +29,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 };
 
 #endif // GTKMM_EXAMPLE_MYAREA_H
diff --git a/examples/book/drawingarea/pango_text/myarea.h b/examples/book/drawingarea/pango_text/myarea.h
index 5ff2a01..822e471 100644
--- a/examples/book/drawingarea/pango_text/myarea.h
+++ b/examples/book/drawingarea/pango_text/myarea.h
@@ -27,7 +27,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
 private:
   void draw_rectangle(const Cairo::RefPtr<Cairo::Context>& cr, int width, int height);
diff --git a/examples/book/drawingarea/simple/myarea.h b/examples/book/drawingarea/simple/myarea.h
index 3bbc877..7642930 100644
--- a/examples/book/drawingarea/simple/myarea.h
+++ b/examples/book/drawingarea/simple/myarea.h
@@ -29,7 +29,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 };
 
 #endif // GTKMM_EXAMPLE_MYAREA_H
diff --git a/examples/book/drawingarea/thin_lines/myarea.h b/examples/book/drawingarea/thin_lines/myarea.h
index 7b16991..00a2a6d 100644
--- a/examples/book/drawingarea/thin_lines/myarea.h
+++ b/examples/book/drawingarea/thin_lines/myarea.h
@@ -30,7 +30,7 @@ public:
 
 protected:
   //Override default signal handler:
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
 
 private:
   double m_fix;
diff --git a/examples/book/keyboard_events/propagation/examplewindow.h 
b/examples/book/keyboard_events/propagation/examplewindow.h
index 1e617cc..36b4f43 100644
--- a/examples/book/keyboard_events/propagation/examplewindow.h
+++ b/examples/book/keyboard_events/propagation/examplewindow.h
@@ -28,7 +28,7 @@ public:
 
 private:
   //Override default signal handler:
-  virtual bool on_key_release_event(GdkEventKey* event);
+  bool on_key_release_event(GdkEventKey* event) override;
 
   bool entryKeyRelease(GdkEventKey* event);
   bool gridKeyRelease(GdkEventKey* event);
diff --git a/examples/book/keyboard_events/simple/examplewindow.h 
b/examples/book/keyboard_events/simple/examplewindow.h
index 31ea0e3..6d335e9 100644
--- a/examples/book/keyboard_events/simple/examplewindow.h
+++ b/examples/book/keyboard_events/simple/examplewindow.h
@@ -28,7 +28,7 @@ public:
 
 private:
   //Override default signal handler:
-  virtual bool on_key_press_event(GdkEventKey* event);
+  bool on_key_press_event(GdkEventKey* event) override;
 
   Gtk::Grid m_container;
   Gtk::RadioButton m_first;
diff --git a/examples/book/menus/main_menu/exampleapplication.h 
b/examples/book/menus/main_menu/exampleapplication.h
index 59aa638..a31c9de 100644
--- a/examples/book/menus/main_menu/exampleapplication.h
+++ b/examples/book/menus/main_menu/exampleapplication.h
@@ -28,8 +28,8 @@ public:
 
 protected:
   //Overrides of default signal handlers:
-  virtual void on_startup();
-  virtual void on_activate();
+  void on_startup() override;
+  void on_activate() override;
 
 private:
   void create_window();
diff --git a/examples/book/menus/popup/examplewindow.h b/examples/book/menus/popup/examplewindow.h
index d57d4ad..88c2a03 100644
--- a/examples/book/menus/popup/examplewindow.h
+++ b/examples/book/menus/popup/examplewindow.h
@@ -29,7 +29,8 @@ public:
 
 protected:
   //Signal handlers:
-  virtual bool on_button_press_event(GdkEventButton* event);
+  bool on_button_press_event(GdkEventButton* button_event) override;
+
   void on_menu_file_popup_generic();
 
   //Child widgets:
diff --git a/examples/book/printing/advanced/previewdialog.h b/examples/book/printing/advanced/previewdialog.h
index 31da719..0852f12 100644
--- a/examples/book/printing/advanced/previewdialog.h
+++ b/examples/book/printing/advanced/previewdialog.h
@@ -33,7 +33,8 @@ protected:
 
   void on_page_number_changed();
   void on_close_clicked();
-  virtual void on_hide();
+
+  void on_hide() override;
 
   virtual bool on_drawing_area_draw(const Cairo::RefPtr<Cairo::Context>& cr);
 
diff --git a/examples/book/printing/advanced/printformoperation.h 
b/examples/book/printing/advanced/printformoperation.h
index 94dc6a3..d5cbbd6 100644
--- a/examples/book/printing/advanced/printformoperation.h
+++ b/examples/book/printing/advanced/printformoperation.h
@@ -40,14 +40,14 @@ class PrintFormOperation : public Gtk::PrintOperation
   PrintFormOperation();
 
   //PrintOperation default signal handler overrides:
-  virtual void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context);
-  virtual void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr);
+  void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context) override;
+  void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr) override;
 
-  virtual Gtk::Widget* on_create_custom_widget();
-  virtual void on_custom_widget_apply(Gtk::Widget* widget);
+  Gtk::Widget* on_create_custom_widget() override;
+  void on_custom_widget_apply(Gtk::Widget* widget) override;
 
 
-  virtual bool on_preview(const Glib::RefPtr<Gtk::PrintOperationPreview>& preview, const 
Glib::RefPtr<Gtk::PrintContext>& context, Gtk::Window* parent);
+  bool on_preview(const Glib::RefPtr<Gtk::PrintOperationPreview>& preview, const 
Glib::RefPtr<Gtk::PrintContext>& context, Gtk::Window* parent) override;
 
   void on_preview_window_hide();
 
diff --git a/examples/book/printing/simple/printformoperation.h 
b/examples/book/printing/simple/printformoperation.h
index 303ae59..d118f0e 100644
--- a/examples/book/printing/simple/printformoperation.h
+++ b/examples/book/printing/simple/printformoperation.h
@@ -36,8 +36,8 @@ class PrintFormOperation : public Gtk::PrintOperation
   PrintFormOperation();
 
   //PrintOperation default signal handler overrides:
-  virtual void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context);
-  virtual void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr);
+  void on_begin_print(const Glib::RefPtr<Gtk::PrintContext>& context) override;
+  void on_draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int page_nr) override;
 
   Glib::ustring m_Name;
   Glib::ustring m_Comments;
diff --git a/examples/book/toolpalette/canvas.h b/examples/book/toolpalette/canvas.h
index 287e821..a25e8cb 100644
--- a/examples/book/toolpalette/canvas.h
+++ b/examples/book/toolpalette/canvas.h
@@ -58,12 +58,12 @@ private:
     const Cairo::RefPtr<Cairo::Context>& cr,
     bool preview);
 
-  virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
-  virtual void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, 
-    int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time);
-  virtual bool on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
-  virtual bool on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
-  virtual void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time);
+  bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
+  void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, 
+    int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time) override;
+  bool on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) override;
+  bool on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) override;
+  void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time) override;
 
   bool m_drag_data_requested_for_drop; //So we know what to do in on_drag_data_received().
   CanvasItem* m_drop_item;
diff --git a/examples/book/treeview/drag_and_drop/treemodel_dnd.h 
b/examples/book/treeview/drag_and_drop/treemodel_dnd.h
index c3e4867..3e98c50 100644
--- a/examples/book/treeview/drag_and_drop/treemodel_dnd.h
+++ b/examples/book/treeview/drag_and_drop/treemodel_dnd.h
@@ -48,8 +48,8 @@ public:
 
 protected:
   //Overridden virtual functions:
-  virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const;
-  virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData& 
selection_data) const;
+  bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const override;
+  bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData& selection_data) 
const override;
   
 };
 
diff --git a/examples/book/treeview/popup/treeview_withpopup.h 
b/examples/book/treeview/popup/treeview_withpopup.h
index 3ae64df..cd439d4 100644
--- a/examples/book/treeview/popup/treeview_withpopup.h
+++ b/examples/book/treeview/popup/treeview_withpopup.h
@@ -30,7 +30,7 @@ public:
 protected:
   // Override Signal handler:
   // Alternatively, use signal_button_press_event().connect_notify()
-  virtual bool on_button_press_event(GdkEventButton *ev);
+  bool on_button_press_event(GdkEventButton* button_event) override;
 
   //Signal handler for popup menu items:
   void on_menu_file_popup_generic();
diff --git a/examples/others/cellrenderercustom/cellrendererlist.h 
b/examples/others/cellrenderercustom/cellrendererlist.h
index 3d9a515..e49834f 100644
--- a/examples/others/cellrenderercustom/cellrendererlist.h
+++ b/examples/others/cellrenderercustom/cellrendererlist.h
@@ -32,7 +32,7 @@ public:
   Glib::ustring get_selected_item();
 
 protected:
-  virtual void on_show_popup(const Glib::ustring& path, int x1, int y1, int x2, int y2);
+  void on_show_popup(const Glib::ustring& path, int x1, int y1, int x2, int y2) override;
 
 private:
   typedef CellRendererList Self;
diff --git a/examples/others/cellrenderercustom/cellrendererpopup.h 
b/examples/others/cellrenderercustom/cellrendererpopup.h
index 219c701..88f55c7 100644
--- a/examples/others/cellrenderercustom/cellrendererpopup.h
+++ b/examples/others/cellrenderercustom/cellrendererpopup.h
@@ -47,18 +47,18 @@ protected:
 
   //TODO: Port this to gtkmm 3:
   /*
-  virtual void get_preferred_size_vfunc(Gtk::Widget& widget,
+  void get_preferred_size_vfunc(Gtk::Widget& widget,
                               const Gdk::Rectangle* cell_area,
                               int* x_offset, int* y_offset,
-                              int* width,    int* height) const;
+                              int* width,    int* height) const  override;
   */
 
-  virtual Gtk::CellEditable* start_editing_vfunc(GdkEvent* event,
+  Gtk::CellEditable* start_editing_vfunc(GdkEvent* event,
                                                  Gtk::Widget& widget,
                                                  const Glib::ustring& path,
                                                  const Gdk::Rectangle& background_area,
                                                  const Gdk::Rectangle& cell_area,
-                                                 Gtk::CellRendererState flags);
+                                                 Gtk::CellRendererState flags) override;
 
   virtual void on_show_popup(const Glib::ustring& path, int x1, int y1, int x2, int y2);
   virtual void on_hide_popup();
diff --git a/examples/others/cellrenderercustom/cellrenderertoggle.cc 
b/examples/others/cellrenderercustom/cellrenderertoggle.cc
index ee5cc72..1ac0a30 100644
--- a/examples/others/cellrenderercustom/cellrenderertoggle.cc
+++ b/examples/others/cellrenderercustom/cellrenderertoggle.cc
@@ -42,23 +42,24 @@ public:
   SignalToggled& signal_toggled();
 
 protected:
-  virtual void get_preferred_size_vfunc(Gtk::Widget& widget,
+  //TODO: Update for gtkmm 3. This isn't currently overriding anything.
+  void get_preferred_size_vfunc(Gtk::Widget& widget,
                               const Gdk::Rectangle* cell_area,
                               int* x_offset, int* y_offset,
-                              int* width,    int* height) const;
+                              int* width,    int* height) const /* override */;
 
-  virtual void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr,
+  void render_vfunc(const Cairo::RefPtr<Cairo::Context>& cr,
                             Gtk::Widget& widget,
                             const Gdk::Rectangle& background_area,
                             const Gdk::Rectangle& cell_area,
-                            Gtk::CellRendererState flag);
+                            Gtk::CellRendererState flag) override;
 
-  virtual bool activate_vfunc(GdkEvent* event,
+  bool activate_vfunc(GdkEvent* event,
                               Gtk::Widget& widget,
                               const Glib::ustring& path,
                               const Gdk::Rectangle& background_area,
                               const Gdk::Rectangle& cell_area,
-                              Gtk::CellRendererState flags);
+                              Gtk::CellRendererState flags) override;
 
 private:
   Glib::Property<bool> property_activatable_;
diff --git a/examples/others/cellrenderercustom/popupentry.h b/examples/others/cellrenderercustom/popupentry.h
index 5172a77..0f36952 100644
--- a/examples/others/cellrenderercustom/popupentry.h
+++ b/examples/others/cellrenderercustom/popupentry.h
@@ -44,8 +44,8 @@ public:
   type_signal_arrow_clicked& signal_arrow_clicked();
 
 protected:
-  virtual bool on_key_press_event(GdkEventKey* event);
-  virtual void start_editing_vfunc(GdkEvent* event);
+  bool on_key_press_event(GdkEventKey* key_event) override;
+  void start_editing_vfunc(GdkEvent* event) override;
 
 private:
   typedef PopupEntry Self;
diff --git a/examples/others/treemodelcustom/exampletreemodel.h 
b/examples/others/treemodelcustom/exampletreemodel.h
index f0d69b2..45bc55f 100644
--- a/examples/others/treemodelcustom/exampletreemodel.h
+++ b/examples/others/treemodelcustom/exampletreemodel.h
@@ -38,23 +38,23 @@ public:
 protected:
 
    // Overrides:
-   virtual Gtk::TreeModelFlags get_flags_vfunc() const;
-   virtual int get_n_columns_vfunc() const;
-   virtual GType get_column_type_vfunc(int index) const;
-   virtual void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const;
+   Gtk::TreeModelFlags get_flags_vfunc() const override;
+   int get_n_columns_vfunc() const override;
+   GType get_column_type_vfunc(int index) const override;
+   void get_value_vfunc(const TreeModel::iterator& iter, int column, Glib::ValueBase& value) const override;
   
    bool iter_next_vfunc(const iterator& iter, iterator& iter_next) const;
 
    //TODO: Make sure that we make all of these const when we have made them all const in the TreeModel:
-   virtual bool iter_children_vfunc(const iterator& parent, iterator& iter) const;
-   virtual bool iter_has_child_vfunc(const iterator& iter) const;
-   virtual int iter_n_children_vfunc(const iterator& iter) const;
-   virtual int iter_n_root_children_vfunc() const;
-   virtual bool iter_nth_child_vfunc(const iterator& parent, int n, iterator& iter) const;
-   virtual bool iter_nth_root_child_vfunc(int n, iterator& iter) const;
-   virtual bool iter_parent_vfunc(const iterator& child, iterator& iter) const;
-   virtual Path get_path_vfunc(const iterator& iter) const;
-   virtual bool get_iter_vfunc(const Path& path, iterator& iter) const;
+   bool iter_children_vfunc(const iterator& parent, iterator& iter) const override;
+   bool iter_has_child_vfunc(const iterator& iter) const override;
+   int iter_n_children_vfunc(const iterator& iter) const override;
+   int iter_n_root_children_vfunc() const override;
+   bool iter_nth_child_vfunc(const iterator& parent, int n, iterator& iter) const override;
+   bool iter_nth_root_child_vfunc(int n, iterator& iter) const override;
+   bool iter_parent_vfunc(const iterator& child, iterator& iter) const override;
+   Path get_path_vfunc(const iterator& iter) const override;
+   bool get_iter_vfunc(const Path& path, iterator& iter) const override;
 
 private:
    typedef std::vector< Glib::ustring> typeRow; //X columns, all of type string.
diff --git a/examples/others/window/wheelbarrow.cc b/examples/others/window/wheelbarrow.cc
index f61ef12..0ec2179 100644
--- a/examples/others/window/wheelbarrow.cc
+++ b/examples/others/window/wheelbarrow.cc
@@ -136,7 +136,7 @@ public:
   virtual ~Wheelbarrow();
 
 protected:
-  virtual bool on_button_press_event(GdkEventButton* event);
+  bool on_button_press_event(GdkEventButton* button_event) override;
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]