diff options
| author | Marco Nelissen <marcone@google.com> | 2010-10-06 13:20:12 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2010-10-06 13:20:12 -0700 |
| commit | fe524684fb19d6e0c584aa9e70dba8e6887f3179 (patch) | |
| tree | 39f21205a1d12faad79c421df946566d0e1ec427 /simulator | |
| parent | 7da3f9f51e5c9e51680cf3ee9954301d97d1db0e (diff) | |
| download | android_development-fe524684fb19d6e0c584aa9e70dba8e6887f3179.tar.gz android_development-fe524684fb19d6e0c584aa9e70dba8e6887f3179.tar.bz2 android_development-fe524684fb19d6e0c584aa9e70dba8e6887f3179.zip | |
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
Diffstat (limited to 'simulator')
| -rw-r--r-- | simulator/app/DeviceWindow.cpp | 2 | ||||
| -rw-r--r-- | simulator/app/MainFrame.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/simulator/app/DeviceWindow.cpp b/simulator/app/DeviceWindow.cpp index a15b03ba1..7c856db7f 100644 --- a/simulator/app/DeviceWindow.cpp +++ b/simulator/app/DeviceWindow.cpp @@ -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) { diff --git a/simulator/app/MainFrame.cpp b/simulator/app/MainFrame.cpp index b13caab2d..bbad4e02c 100644 --- a/simulator/app/MainFrame.cpp +++ b/simulator/app/MainFrame.cpp @@ -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"), |