From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Mon, 28 Dec 2015 06:33:19 +0000 (+0900)
Subject: [UI][Qt] Revert befor commit.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=57dad80ab07c700112fba737041c2990dd79df11;p=csp-qt%2Fcommon_source_project-fm7.git

[UI][Qt] Revert befor commit.
[VM][FAMILYBASIC] Fix FTBFS.
---

diff --git a/source/src/qt/machines/babbage2nd/MainWindow.cpp b/source/src/qt/machines/babbage2nd/MainWindow.cpp
index 7e6238bc3..abaa1d062 100644
--- a/source/src/qt/machines/babbage2nd/MainWindow.cpp
+++ b/source/src/qt/machines/babbage2nd/MainWindow.cpp
@@ -31,8 +31,8 @@ void META_MainWindow::retranslateUi(void)
 	actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
 	
 	menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
-	//menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
-	menuMachine->setVisible(false);
+	menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
+	//menuMachine->setVisible(false);
    
 	actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
 	menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
diff --git a/source/src/qt/machines/bmjr/MainWindow.cpp b/source/src/qt/machines/bmjr/MainWindow.cpp
index af0480320..1bc6441bf 100644
--- a/source/src/qt/machines/bmjr/MainWindow.cpp
+++ b/source/src/qt/machines/bmjr/MainWindow.cpp
@@ -35,6 +35,7 @@ void META_MainWindow::retranslateUi(void)
 
 	menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
 	menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
+	//menuMachine->setVisible(false);
   
 	menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 	actionHelp_AboutQt->setText(QApplication::translate("MainWindow", "About Qt", 0));
diff --git a/source/src/qt/machines/ex80/MainWindow.cpp b/source/src/qt/machines/ex80/MainWindow.cpp
index 28a912dbc..42be7b474 100644
--- a/source/src/qt/machines/ex80/MainWindow.cpp
+++ b/source/src/qt/machines/ex80/MainWindow.cpp
@@ -155,7 +155,8 @@ void META_MainWindow::retranslateUi(void)
 
 	menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
 	menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
-  
+	actionMouseEnable->setVisible(false);
+
 	menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
 	actionHelp_AboutQt->setText(QApplication::translate("MainWindow", "About Qt", 0));
 
diff --git a/source/src/vm/familybasic/familybasic.h b/source/src/vm/familybasic/familybasic.h
index 192550e91..74b24e6f8 100644
--- a/source/src/vm/familybasic/familybasic.h
+++ b/source/src/vm/familybasic/familybasic.h
@@ -29,6 +29,7 @@
 #define USE_AUTO_KEY		5
 #define USE_AUTO_KEY_RELEASE	6
 #define USE_AUTO_KEY_NO_CAPS
+#define USE_JOYSTICK
 #define USE_STATE
 
 #include "../../common.h"