// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
#include "wx/motif/bmpmotif.h"
#ifndef WX_PRECOMP
static inline wxCharBuffer GetCacheImageName(WXImage image)
{
- return wxString::Format(_T("wxBitmap_%p"), image).ToAscii();
+ return wxString::Format(wxT("wxBitmap_%p"), image).ToAscii();
}
wxBitmapCache::~wxBitmapCache()
void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
{
- if( m_bitmap != bitmap )
+ if ( !m_bitmap.IsSameAs(bitmap) )
{
InvalidateCache();
m_bitmap = bitmap;
{
XmUninstallImage( (XImage*)m_image );
XtFree( (char*)(XImage*)m_image );
- m_image = (WXImage*)NULL;
+ m_image = NULL;
}
}
}
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.