From 5611d53c8c5ecf586233636d6090ce7e47644e04 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Thu, 21 Feb 2013 21:49:19 +0100
Subject: fixed global object initialization order issue

 * Scintilla is now initialized from main() using Interface::main()
 * Scintilla initialization depends on initialization of objects in the
   global namespace (otherwise the Lexer catalogue may not be filled
   properly and lexing may not work). Lexer modules were initialized
   after SciTECO interface initialization
 * merged Scintilla initialization (Interface::main()) with interface
   option parsing
---
 src/interface-gtk.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/interface-gtk.h')

diff --git a/src/interface-gtk.h b/src/interface-gtk.h
index 43e9e89..baa499c 100644
--- a/src/interface-gtk.h
+++ b/src/interface-gtk.h
@@ -37,7 +37,11 @@ extern class InterfaceGtk : public Interface {
 	GtkWidget *popup_widget;
 
 public:
-	InterfaceGtk();
+	InterfaceGtk() : window(NULL),
+			 editor_widget(NULL),
+			 cmdline_widget(NULL),
+			 info_widget(NULL), message_widget(NULL),
+			 popup_widget(NULL) {}
 	~InterfaceGtk();
 
 	inline GOptionGroup *
@@ -45,11 +49,7 @@ public:
 	{
 		return gtk_get_option_group(TRUE);
 	}
-	inline void
-	parse_args(int &argc, char **&argv)
-	{
-		gtk_parse_args(&argc, &argv);
-	}
+	void main(int &argc, char **&argv);
 
 	void vmsg(MessageType type, const gchar *fmt, va_list ap);
 	void msg_clear(void);
-- 
cgit v1.2.3