X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/455f7c8205e5dc29d99026b158ae0a394dccc839..74b1f0b45e0f0bc7e25c5f32bb495e3e4bcd3392:/src/motif/bmpmotif.cpp?ds=sidebyside diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp index 525bc355a0..51caa8e009 100644 --- a/src/motif/bmpmotif.cpp +++ b/src/motif/bmpmotif.cpp @@ -36,7 +36,7 @@ Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ); static inline wxCharBuffer GetCacheImageName(WXImage image) { - return wxString::Format(_T("wxBitmap_%p"), image).ToAscii(); + return wxString::Format(wxT("wxBitmap_%p"), image).ToAscii(); } wxBitmapCache::~wxBitmapCache() @@ -74,7 +74,7 @@ void wxBitmapCache::SetBitmap( const wxBitmap& bitmap ) { XmUninstallImage( (XImage*)m_image ); XtFree( (char*)(XImage*)m_image ); - m_image = (WXImage*)NULL; + m_image = NULL; } } } @@ -263,7 +263,7 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap ) stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 ); if ( 0 != stipple ) { - gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL ); + gc = XCreateGC( display, pixmap, (XtGCMask)0, NULL ); if ( NULL != gc ) { /* Create an identical copy of the argument pixmap.