[gtkmm: 2/3] Fix typos and circular include in ColumnView

[Kjell Ahlstedt <kjellahl src gnome org>]

commit ceb23ce2e9b5e720f1e06fe10d9d991bf09723ea
Author: Andreas Persson <andreasp56 outlook com>
Date:   Tue Aug 4 07:52:06 2020 +0200

    Fix typos and circular include in ColumnView
    
    Fixes after merge request review. Circular include between columnview.h
    and columnviewcolumn.h removed.

 gtk/src/columnview.hg        | 5 +----
 gtk/src/columnviewcolumn.ccg | 1 +
 gtk/src/columnviewcolumn.hg  | 3 +--
 gtk/src/sorter.hg            | 3 ++-
 4 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/gtk/src/columnview.hg b/gtk/src/columnview.hg
index b67af033..ade41a4c 100644
--- a/gtk/src/columnview.hg
+++ b/gtk/src/columnview.hg
@@ -25,9 +25,6 @@ _PINCLUDE(gtkmm/private/widget_p.h)
 namespace Gtk
 {
 
-class ColumnViewColumn;
-class Sorter;
-
 /** A widget for displaying lists in multiple columns.
  *
  * %Gtk::ColumnView is a widget to present a view into a large dynamic list of items
@@ -77,7 +74,7 @@ public:
 #m4 _CONVERSION(`const Glib::RefPtr<ColumnViewColumn>&', `GtkColumnViewColumn*', __CONVERT_REFPTR_TO_P)
   _WRAP_METHOD(void append_column(const Glib::RefPtr<ColumnViewColumn>& column), 
gtk_column_view_append_column)
   _WRAP_METHOD(void remove_column(const Glib::RefPtr<ColumnViewColumn>& column), 
gtk_column_view_remove_column)
-  _WRAP_METHOD(void instert_column(guint position, const Glib::RefPtr<ColumnViewColumn>& column), 
gtk_column_view_insert_column)
+  _WRAP_METHOD(void insert_column(guint position, const Glib::RefPtr<ColumnViewColumn>& column), 
gtk_column_view_insert_column)
 
   _WRAP_METHOD(Glib::RefPtr<Gio::ListModel> get_model(), gtk_column_view_get_model, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gio::ListModel> get_model() const, gtk_column_view_get_model, refreturn, 
constversion)
diff --git a/gtk/src/columnviewcolumn.ccg b/gtk/src/columnviewcolumn.ccg
index 57b87fdc..d6650ef5 100644
--- a/gtk/src/columnviewcolumn.ccg
+++ b/gtk/src/columnviewcolumn.ccg
@@ -15,3 +15,4 @@
  */
 
 #include <gtk/gtk.h>
+#include <gtkmm/columnview.h>
diff --git a/gtk/src/columnviewcolumn.hg b/gtk/src/columnviewcolumn.hg
index 8949d04b..bcfc8dac 100644
--- a/gtk/src/columnviewcolumn.hg
+++ b/gtk/src/columnviewcolumn.hg
@@ -19,7 +19,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <glibmm/object.h>
 #include <gtkmm/listitemfactory.h>
 #include <giomm/menumodel.h>
-#include <gtkmm/columnview.h>
 #include <gtkmm/sorter.h>
 
 _DEFS(gtkmm,gtk)
@@ -27,7 +26,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gtk
 {
-class ColumnView;
+class GTKMM_API ColumnView;
 
 /** The column added to Gtk::ColumnView.
  *
diff --git a/gtk/src/sorter.hg b/gtk/src/sorter.hg
index 8302f297..ddcd080f 100644
--- a/gtk/src/sorter.hg
+++ b/gtk/src/sorter.hg
@@ -14,6 +14,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glibmm/object.h>
 #include <gtkmm/enums.h>
 
 _DEFS(gtkmm,gtk)
@@ -31,7 +32,7 @@ namespace Gtk
  * by calling compare() for pairs of items.
  *
  * Sorters may change their sorting behavior through their lifetime. In that case,
- * they will emit the singal_changed() signal to notify that the sort order is
+ * they will emit the signal_changed() signal to notify that the sort order is
  * no longer valid and should be updated by calling compare() again.
  *
  * GTK provides various pre-made sorter implementations for common sorting operations.