LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are

Browse Source 
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
This commit is contained in:
Marco Nelissen
2010-10-06 13:20:12 -07:00
parent 7da3f9f51e
commit fe524684fb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulator/app/DeviceWindow.cpp
View File

@@ -172,7 +172,7 @@ void DeviceWindow::OnUserEvent(UserEvent& event)
if (fileNameExists && *onionSkinFileName) { if (fileNameExists && *onionSkinFileName) {
wxImage onionSkinImage(wxString::FromAscii(onionSkinFileName)); wxImage onionSkinImage(wxString::FromAscii(onionSkinFileName));
onionSkinImage.SetAlpha(NULL); onionSkinImage.SetAlpha(NULL);
bool hasAlpha = onionSkinImage.HasAlpha(); bool hasAlpha = false; // onionSkinImage.HasAlpha();
int width = onionSkinImage.GetWidth(); int width = onionSkinImage.GetWidth();
int height = onionSkinImage.GetHeight(); int height = onionSkinImage.GetHeight();
if (hasAlpha) { if (hasAlpha) {

4
simulator/app/MainFrame.cpp
View File

@@ -198,7 +198,7 @@ void MainFrame::ConstructMenu(void)
menuFile->Append(IDM_FILE_PREFERENCES, wxT("&Preferences..."), menuFile->Append(IDM_FILE_PREFERENCES, wxT("&Preferences..."),
wxT("Edit simulator preferences")); wxT("Edit simulator preferences"));
menuFile->AppendSeparator(); //menuFile->AppendSeparator();
menuFile->Append(IDM_FILE_EXIT, wxT("E&xit\tCtrl-Q"), menuFile->Append(IDM_FILE_EXIT, wxT("E&xit\tCtrl-Q"),
wxT("Stop simulator and exit")); wxT("Stop simulator and exit"));
@@ -210,7 +210,7 @@ void MainFrame::ConstructMenu(void)
wxT("Start the device")); wxT("Start the device"));
// menuRuntime->Append(IDM_RUNTIME_STOP, wxT("Power &Off"), // menuRuntime->Append(IDM_RUNTIME_STOP, wxT("Power &Off"),
// wxT("Stop the device")); // wxT("Stop the device"));
menuRuntime->AppendSeparator(); // menuRuntime->AppendSeparator();
// menuRuntime->Append(IDM_RUNTIME_RESTART, wxT("&Restart"), // menuRuntime->Append(IDM_RUNTIME_RESTART, wxT("&Restart"),
// wxT("Restart the device")); // wxT("Restart the device"));
menuRuntime->Append(IDM_RUNTIME_KILL, wxT("&Kill\tCtrl-K"), menuRuntime->Append(IDM_RUNTIME_KILL, wxT("&Kill\tCtrl-K"),