(svn r11648) -Fix [FS#1560]: the company password was not set when one pressed the enter key.

src/network/network_gui.cpp

@@ -1938,7 +1938,11 @@ static void NetworkCompanyPasswordWindowWndProc(Window *w, WindowEvent *e)
 		case WE_KEYPRESS:
 			switch (HandleEditBoxKey(w, &WP(w, chatquerystr_d), 4, e)) {
 				case 1: // Return
-					/* FALLTHROUGH */
+					e->event = WE_CLICK;
+					e->we.click.widget = NCPWW_OK;
+					NetworkCompanyPasswordWindowWndProc(w, e);
+					break;
+
 				case 2: // Escape
 					DeleteWindow(w);
 					break;

src/strings.cpp

@@ -33,7 +33,6 @@
 #include "vehicle.h"
 #include "newgrf_engine.h"
 #include "spritecache.h"
-#undef WITH_FREETYPE
 #include "fontcache.h"
 #include "gui.h"