Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are
not present (anymore?) in the wx2.6 .so, but gcc wants to use the
exported functions instead of inlining them. Comment them out for now.
Change-Id: I1b2385c48c77e23f9885f79092f69795a41afd8f
diff --git a/simulator/app/DeviceWindow.cpp b/simulator/app/DeviceWindow.cpp
index a15b03b..7c856db 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 = onionSkinImage.HasAlpha();
+ bool hasAlpha = false; // 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 b13caab..bbad4e0 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"),
