Modifications to get wxNanoX compiling again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -733,14 +733,14 @@ wxImage wxBitmap::ConvertToImage() const
|
||||
|
||||
Display *xdisplay = (Display*) M_BMPDATA->m_display;
|
||||
wxASSERT_MSG( xdisplay, wxT("No display") );
|
||||
|
||||
int bpp = wxTheApp->m_visualDepth;
|
||||
|
||||
#if wxUSE_NANOX
|
||||
//int bpp = DefaultDepth(xdisplay, xscreen);
|
||||
wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image);
|
||||
return image;
|
||||
#else
|
||||
// !wxUSE_NANOX
|
||||
int bpp = wxTheApp->m_visualDepth;
|
||||
XImage *x_image = NULL;
|
||||
if (GetPixmap())
|
||||
{
|
||||
|
Reference in New Issue
Block a user