SetPath() is now implemented in dirdlg.cpp

[wxWidgets.git] / src / x11 / bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index a365ddf028ff18cfd46e7f8d40af37dcc0a3e348..9659dc351c9a9d236f6549128f06b25366ef8f47 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -733,14 +733,14 @@ wxImage wxBitmap::ConvertToImage() const
 
     Display *xdisplay = (Display*) M_BMPDATA->m_display;
     wxASSERT_MSG( xdisplay, wxT("No display") );
 
     Display *xdisplay = (Display*) M_BMPDATA->m_display;
     wxASSERT_MSG( xdisplay, wxT("No display") );

-    
-    int bpp = wxTheApp->m_visualDepth;

 
 #if wxUSE_NANOX
 
 #if wxUSE_NANOX

+    //int bpp = DefaultDepth(xdisplay, xscreen);

     wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image);
     return image;
 #else
     // !wxUSE_NANOX
     wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image);
     return image;
 #else
     // !wxUSE_NANOX

+    int bpp = wxTheApp->m_visualDepth;

     XImage *x_image = NULL;
     if (GetPixmap())
     {
     XImage *x_image = NULL;
     if (GetPixmap())
     {