Fixed broken overtype update in the statusbar.

Removed unused field do_overwrite in document struct.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1067 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -3,6 +3,10 @@
  * src/build.c: Made the created run script for command execution a bit
                 more portable to other shells than bash (thanks to
                 Nacho Cabanes for reporting).
+ * src/document.c, src/document.h, src/sciwrappers.c, src/ui_utils.h,
+   src/sciwrappers.h:
+   Fixed broken overtype update in the statusbar.
+   Removed unused field do_overwrite in document struct.
 
 
 2006-12-07  Frank Lanitz  <frank@frank.uvena.de>

src/document.c

@@ -305,7 +305,6 @@ static gint document_create_new_sci(const gchar *filename)
 	this->mtime = 0;
 	this->changed = FALSE;
 	this->last_check = time(NULL);
-	this->do_overwrite = FALSE;
 	this->readonly = FALSE;
 	this->line_breaking = app->pref_editor_line_breaking;
 	this->use_auto_indention = app->pref_editor_use_auto_indention;

src/document.h

@@ -61,7 +61,6 @@ typedef struct document
 	GtkTreeIter		 iter;
 	gboolean		 readonly;
 	gboolean		 changed;
-	gboolean		 do_overwrite;
 	gboolean		 line_breaking;
 	gboolean		 use_auto_indention;
 	time_t			 last_check;	// to remember the last disk check

src/sciwrappers.c

@@ -903,3 +903,8 @@ gint sci_find_bracematch(ScintillaObject *sci, gint pos)
 	return SSM(sci, SCI_BRACEMATCH, pos, 0);
 }
 
+gint sci_get_overtype(ScintillaObject *sci)
+{
+	return SSM(sci, SCI_GETOVERTYPE, 0, 0);
+}
+

src/sciwrappers.h

@@ -165,4 +165,6 @@ gint				sci_get_line_indent_position(ScintillaObject * sci, gint line);
 void				sci_set_autoc_max_height	(ScintillaObject * sci, gint val);
 gint				sci_find_bracematch			(ScintillaObject * sci, gint pos);
 
+gint				sci_get_overtype			(ScintillaObject * sci);
+
 #endif

src/ui_utils.c

@@ -115,7 +115,7 @@ void ui_update_statusbar(gint idx, gint pos)
 			(doc_list[idx].changed) ? 42 : 32,
 			(line + 1), (col + 1),
 			sci_get_selected_text_length(doc_list[idx].sci) - 1,
-			doc_list[idx].do_overwrite ? _("OVR") : _("INS"),
+			sci_get_overtype(doc_list[idx].sci) ? _("OVR") : _("INS"),
 			document_get_eol_mode(idx),
 			(doc_list[idx].readonly) ? ", read only" : "",
 			cur_tag,