X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fttedit.cpp;h=9f34039982ccb8231ca5302734ff28e456e592a5;hb=2b16243b0aa693d18ce49a071cdae73cadc37c4f;hp=54617e944e4ec6d47f485cb2c05d741814bb44db;hpb=29b571499a38273c6c693334512e44f4162171a5;p=ttedit

diff --git a/src/ttedit.cpp b/src/ttedit.cpp
index 54617e9..9f34039 100755
--- a/src/ttedit.cpp
+++ b/src/ttedit.cpp
@@ -16,34 +16,17 @@
 // JLH  03/05/2009  Initial conversion from wxWidgets to Qt
 //
 
-// FIXED:
-//
-// - Fix problem with tool palette not getting focus 1st time it's called up [DONE]
-// - Split out windows/classes defined here into their own files [DONE]
-//
-// STILL TO BE DONE:
-//
-// - Fix bug in Glyphpoints when dragging on an empty canvas or loading a font
-// - Fix scrolling, zooming, settings (ini)
-// - Finish conversion to wxWidgets for cross-platform portability
-// - Fix problem with owned window causing main window refresh problems
-//   (ironically enough, it doesn't seem to be a problem anymore...)
-//
-
-// Uncomment this for debugging...
-//#define DEBUG
-//#define DEBUGFOO			// Various tool debugging...
-//#define DEBUGTP				// Toolpalette debugging...
-
 #include "ttedit.h"
 #include <QApplication>
-#include "ttemainwindow.h"
-//#include "charwindow.h"
+#include "mainwindow.h"
 
 // Main app constructor--we stick globally accessible stuff here...
 
-TTEdit::TTEdit(int argc, char * argv[]): QApplication(argc, argv), charWnd(NULL)
+TTEdit::TTEdit(int & argc, char * argv[]): QApplication(argc, argv), charWnd(NULL)
 {
+	mainWindow = new MainWindow;
+//printf("mainWindow.show();\n");
+	mainWindow->show();
 }
 
 
@@ -56,11 +39,7 @@ int main(int argc, char * argv[])
 //printf("TTEdit app(argc, argv);\n");
 	TTEdit app(argc, argv);
 //printf("TTEMainWindow mainWindow;\n");
-	TTEMainWindow mainWindow;
-//printf("mainWindow.show();\n");
-	mainWindow.show();
 //OK, it gets to here at least...
 //printf("return app.exec();\n");
 	return app.exec();
 }
-