Fix for building the sim on glucid.
Change-Id: I7c9df36c02591baa45bffb2da8e885813a3e3d86
Revert "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are"
This reverts commit fe524684fb19d6e0c584aa9e70dba8e6887f3179.
diff --git a/simulator/app/Android.mk b/simulator/app/Android.mk
index 3ce7cd5..5a2d3b5 100644
--- a/simulator/app/Android.mk
+++ b/simulator/app/Android.mk
@@ -70,7 +70,7 @@
# without us explicitly setting the LD_LIBRARY_PATH environment variable
LOCAL_LDLIBS += -Wl,-z,origin
LOCAL_CFLAGS += -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 \
- -D_LARGE_FILES -D_LARGEFILE_SOURCE=1
+ -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
LOCAL_LDLIBS += -lrt
endif
ifeq ($(HOST_OS),darwin)
diff --git a/simulator/app/DeviceWindow.cpp b/simulator/app/DeviceWindow.cpp
index 7c856db..a15b03b 100644
--- a/simulator/app/DeviceWindow.cpp
+++ b/simulator/app/DeviceWindow.cpp
@@ -172,7 +172,7 @@
if (fileNameExists && *onionSkinFileName) {
wxImage onionSkinImage(wxString::FromAscii(onionSkinFileName));
onionSkinImage.SetAlpha(NULL);
- bool hasAlpha = false; // onionSkinImage.HasAlpha();
+ bool hasAlpha = onionSkinImage.HasAlpha();
int width = onionSkinImage.GetWidth();
int height = onionSkinImage.GetHeight();
if (hasAlpha) {
diff --git a/simulator/app/MainFrame.cpp b/simulator/app/MainFrame.cpp
index bbad4e0..b13caab 100644
--- a/simulator/app/MainFrame.cpp
+++ b/simulator/app/MainFrame.cpp
@@ -198,7 +198,7 @@
menuFile->Append(IDM_FILE_PREFERENCES, wxT("&Preferences..."),
wxT("Edit simulator preferences"));
- //menuFile->AppendSeparator();
+ menuFile->AppendSeparator();
menuFile->Append(IDM_FILE_EXIT, wxT("E&xit\tCtrl-Q"),
wxT("Stop simulator and exit"));
@@ -210,7 +210,7 @@
wxT("Start the device"));
// menuRuntime->Append(IDM_RUNTIME_STOP, wxT("Power &Off"),
// wxT("Stop the device"));
-// menuRuntime->AppendSeparator();
+ menuRuntime->AppendSeparator();
// menuRuntime->Append(IDM_RUNTIME_RESTART, wxT("&Restart"),
// wxT("Restart the device"));
menuRuntime->Append(IDM_RUNTIME_KILL, wxT("&Kill\tCtrl-K"),
