updated xml project file with latest changes (spinctrl, display, msgout, ...)

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index a365ddf028ff18cfd46e7f8d40af37dcc0a3e348..38f8aba90aa5190be4e6d83baf921cc29c945f39 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -370,7 +370,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
         XGetGeometry( xdisplay, pixmap, &xroot, &xRet, &yRet,
             &widthRet, &heightRet, &borderWidthRet, &depthRet);
 
-        wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") )
+        wxASSERT_MSG( bpp == (int)depthRet, wxT("colour depth mismatch") );
 #endif
 
         XpmFreeAttributes(&xpmAttr);
@@ -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())
     {