--- gameengine.h.orig	2002-12-01 11:29:00.000000000 +0200
+++ gameengine.h	2006-04-18 15:58:07.000000000 +0300
@@ -21,8 +21,10 @@
 
 #include <stdarg.h>
 #include <vector>
+using namespace std;
 #include <fxdefs.h>
 #include <FXString.h>
+using namespace FX;
 
 #include "fxrepton.h"
 
--- mainwindow.cpp.orig	2002-12-01 11:38:00.000000000 +0200
+++ mainwindow.cpp	2006-04-18 16:18:48.000000000 +0300
@@ -82,14 +82,14 @@
 		exit(1);
 	}
 
-       	FXMenubar *menubar;
+       	FXMenuBar *menubar;
 
-        FXToolbarShell *dragshell1 = new FXToolbarShell(this, FRAME_RAISED);
-        menubar = new FXMenubar(this, dragshell1, FRAME_RAISED|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
-        new FXToolbarGrip(menubar, menubar, FXMenubar::ID_TOOLBARGRIP);
+        FXToolBarShell *dragshell1 = new FXToolBarShell(this, FRAME_RAISED);
+        menubar = new FXMenuBar(this, dragshell1, FRAME_RAISED|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
+        new FXToolBarGrip(menubar, menubar, FXMenuBar::ID_TOOLBARGRIP);
 
-       	FXStatusbar *statusbar;
-	statusbar = new FXStatusbar(this, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER|FRAME_RAISED);
+       	FXStatusBar *statusbar;
+	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER|FRAME_RAISED);
 
         filemenu = new FXMenuPane(this);
         new FXMenuCommand(filemenu, "&Restart level\tF2\tRestart current level.", 0, this, ID_RESTART);
@@ -111,7 +111,7 @@
 		if (!lastPane || lastPackage != ep.package) {
 			// remove "[n] " from "[n] PackageName"
 			FXString package = ep.package;
-  			if (package.findf(']') != -1)
+  			if (package.find(']') != -1)
 				package = package.after(']').trim();
 			FXMenuCascade *cascade = new FXMenuCascade(episodemenu, package);
         		lastPane = new FXMenuPane(this);
@@ -120,7 +120,7 @@
 		}
 		// remove "[n] " from "[n] EpisodeName"
 		FXString name = ep.name;
-  		if (name.findf(']') != -1)
+  		if (name.find(']') != -1)
 			name = name.after(']').trim();
 		new FXMenuCommand(lastPane, name, 0, this, ep.id);
 	}
@@ -179,7 +179,7 @@
 	episode = episodes[1];
 	episode.level = 1;
 
-	timerhandle = getApp()->addTimeout(100, this, ID_TIMER);
+	timerhandle = getApp()->addTimeout(this, ID_TIMER, 100);
 }
 
 MainWindow::~MainWindow()
@@ -356,7 +356,7 @@
 
 long MainWindow::onCmdIconify(FXObject *, FXSelector, void *)
 {
-	iconify();
+	minimize();
 	return 1;
 }
 
@@ -376,7 +376,7 @@
 		typedef vector<Episode>::const_iterator I;
 		for (I i = episodes.begin(); i != episodes.end(); ++i) {
   			Episode ep = *i;
-  			if (ep.id == SELID(sel)) {
+  			if (ep.id == FXSELID(sel)) {
   				if (buttons & SHIFTMASK) {
   					episode.spritespath = ep.spritespath;
 					game->loadSprites(ep.spritespath);
@@ -399,7 +399,7 @@
 	typedef vector<Episode>::const_iterator I;
 	for (I i = episodes.begin(); i != episodes.end(); ++i) {
   		Episode ep = *i;
-  		if (ep.id == SELID(sel)) {
+  		if (ep.id == FXSELID(sel)) {
 			FXint checked = episode.id == ep.id;
 		    	sender->handle(this, MKUINT(ID_SETINTVALUE, SEL_COMMAND), (void*)&checked);
 			break;
@@ -638,7 +638,7 @@
 		}
   	}
 
-	timerhandle = getApp()->addTimeout(delay, this, ID_TIMER);
+	timerhandle = getApp()->addTimeout(this, ID_TIMER, delay);
 	return 1;
 }
 
--- mainwindow.h.orig	2002-12-01 11:29:00.000000000 +0200
+++ mainwindow.h	2006-04-18 16:26:20.000000000 +0300
@@ -20,6 +20,7 @@
 #define MAINWINDOW_H
 
 #include <vector>
+using namespace std;
 
 #include <fx.h>