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

Merge "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."

Browse Source
This commit is contained in:
Marco Nelissen
2010-10-06 16:03:56 -07:00
committed by Android (Google) Code Review
parent 7d0913cdc2 fe524684fb
commit 08cbad2818
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) {
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) {

4
simulator/app/MainFrame.cpp
View File

@@ -198,7 +198,7 @@ void MainFrame::ConstructMenu(void)
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 @@ void MainFrame::ConstructMenu(void)
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"),