--- mainwindow.cpp.orig	2006-04-18 17:13:05.000000000 +0300
+++ mainwindow.cpp	2006-04-18 17:16:58.000000000 +0300
@@ -70,14 +70,14 @@
   	setIcon(bigicon);
     	setMiniIcon(smallicon);
 
-       	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, "&New\t\tCreate a new episode.", 0, this, ID_NEW);
@@ -478,15 +478,16 @@
   	FXHorizontalFrame *epframe =
    		new FXHorizontalFrame(contents, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_Y|LAYOUT_FILL_X,
    			0,0,0,0, 0,0,0,0, 0,0);
-     	FXList *eplist = new FXList(epframe, 10, 0, 0, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+     	FXList *eplist = new FXList(epframe, 0, 0, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+	eplist->setNumVisible(10);
   	typedef vector<Episode>::const_iterator I;
 	for (I i = v.begin(); i != v.end(); ++i) {
 		const Episode& e = *i;
 		FXString package = e.package;
 		FXString name = e.name;
-  		if (package.findf(']') != -1)
+  		if (package.find(']') != -1)
 			package = package.after(']').trim();
-  		if (name.findf(']') != -1)
+  		if (name.find(']') != -1)
 			name = name.after(']').trim();
 		FXString s = FXStringFormat("%s: %s (%s)", package.text(), name.text(), e.path.after(PATHSEP, -1).text());
 		eplist->appendItem(s);
--- map.h.orig	2006-04-18 16:55:24.000000000 +0300
+++ map.h	2006-04-18 16:56:16.000000000 +0300
@@ -20,9 +20,11 @@
 #define MAP_H
 
 #include <vector>
+using namespace std;
 
 #include <fxdefs.h>
 #include <FXString.h>
+using namespace FX;
 
 #include "fxreptoned.h"
 
--- mapviewer.cpp.orig	2006-04-18 17:17:21.000000000 +0300
+++ mapviewer.cpp	2006-04-18 17:18:05.000000000 +0300
@@ -42,10 +42,10 @@
 	sprites = 0;
 	currenttool = Sprite_Rock;
 	leftbtn = false;
-	horizontalScrollbar()->setLine(sprite_width);
-	horizontalScrollbar()->setPage(sprite_width);
-	verticalScrollbar()->setLine(sprite_height);
-	verticalScrollbar()->setPage(sprite_height);
+	horizontalScrollBar()->setLine(sprite_width);
+	horizontalScrollBar()->setPage(sprite_width);
+	verticalScrollBar()->setLine(sprite_height);
+	verticalScrollBar()->setPage(sprite_height);
 }
 
 MapViewer::~MapViewer()
@@ -166,8 +166,8 @@
 long MapViewer::onMotion(FXObject *, FXSelector, void *ptr)
 {
 	FXEvent *ev = (FXEvent *)ptr;
-	int x = (ev->win_x + horizontalScrollbar()->getPosition()) / sprite_width;
-	int y = (ev->win_y + verticalScrollbar()->getPosition()) / sprite_height;
+	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
+	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
 	if (leftbtn && x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
 		if (ev->win_x < 0)
 		    	setPosition(getXPosition() + sprite_width, getYPosition());
@@ -186,8 +186,8 @@
 long MapViewer::onLeftBtnPress(FXObject *, FXSelector, void *ptr)
 {
 	FXEvent *ev = (FXEvent *)ptr;
-	int x = (ev->win_x + horizontalScrollbar()->getPosition()) / sprite_width;
-	int y = (ev->win_y + verticalScrollbar()->getPosition()) / sprite_height;
+	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
+	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
 	if (x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
 		leftbtn = true;
 		grab();
--- mapwindow.cpp.orig	2006-04-18 16:56:52.000000000 +0300
+++ mapwindow.cpp	2006-04-18 17:12:06.000000000 +0300
@@ -55,8 +55,8 @@
 		    	    sprite_width+10, (sprite_height+5)*num_map_sprites + 5);
    	tools->create();
 
-       	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);
   	pos_label = new FXLabel(statusbar, "", 0, FRAME_SUNKEN|LAYOUT_RIGHT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH, 0,0,50,0);
 
 	FXVerticalFrame *contents =
@@ -75,7 +75,7 @@
 	toolsview = new FXImageView(toolsframe, tools, this, ID_TOOLS, LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y,
 				  0,0,sprite_width+10+16,0);
 	toolsview->setBackColor(FXRGB(0, 0, 0));
-	toolsview->verticalScrollbar()->setLine(sprite_height + 5);
+	toolsview->verticalScrollBar()->setLine(sprite_height + 5);
 
   	FXHorizontalFrame *mapframe =
    		new FXHorizontalFrame(contentsh, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_Y|LAYOUT_FILL_X,
@@ -109,7 +109,8 @@
 	FXHorizontalFrame *mapsframe =
    		new FXHorizontalFrame(contentsh21, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y,
    			0,0,0,0, 0,0,0,0, 0,0);
-   	maps_list = new FXList(mapsframe, 20, this, ID_MAPSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+   	maps_list = new FXList(mapsframe, this, ID_MAPSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+	maps_list->setNumVisible(20);
 
 	new FXHorizontalFrame(contentsh22, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
         map_ins = new FXButton(contentsh22, "&New\t\tInsert a new map.", 0, this, ID_MAPINS, FRAME_RAISED|FRAME_THICK);
@@ -124,7 +125,8 @@
   	FXHorizontalFrame *transframe =
    		new FXHorizontalFrame(contentsh23, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y,
    			0,0,0,0, 0,0,0,0, 0,0);
-   	trans_list = new FXList(transframe, 20, this, ID_TRANSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+   	trans_list = new FXList(transframe, this, ID_TRANSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+	trans_list->setNumVisible(20);
 
 	new FXHorizontalFrame(contentsh24, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
         trans_chg = new FXButton(contentsh24, "&Change\t\tChange the transporter destionation coordinates.", 0, this, ID_TRANSCHG, FRAME_RAISED|FRAME_THICK);
@@ -222,8 +224,8 @@
 long MapWindow::onMapMouseMove(FXObject *, FXSelector, void *ptr)
 {
   	FXEvent *ev = (FXEvent *)ptr;
-	int x = (ev->win_x + mapview->horizontalScrollbar()->getPosition()) / sprite_width;
-	int y = (ev->win_y + mapview->verticalScrollbar()->getPosition()) / sprite_height;
+	int x = (ev->win_x + mapview->horizontalScrollBar()->getPosition()) / sprite_width;
+	int y = (ev->win_y + mapview->verticalScrollBar()->getPosition()) / sprite_height;
 	Map *m = episode->maps[currentmap];
 	if (x >= 0 && y >= 0 && x < m->width && y < m->height) {
 		pos_label->setText(FXStringFormat("%d, %d", x+1, y+1));
@@ -235,7 +237,7 @@
 {
   	FXEvent *ev = (FXEvent *)ptr;
 	if (ev->win_x > 2 && ev->win_x < sprite_width + 4) {
-		int y = ev->win_y + toolsview->verticalScrollbar()->getPosition();
+		int y = ev->win_y + toolsview->verticalScrollBar()->getPosition();
 		currenttool = (Sprite)(y / (sprite_height + 5));
   		currenttool = FXMIN(currenttool, Sprite_Spirit);
   		mapview->setTool(currenttool);