64 bit compilation fix (pointer can't be cast to int); code simplification (don't...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/bmpmotif.h b/include/wx/motif/bmpmotif.h
index 1e88d23c75fe2ec86a8a6ed97db7136201de57c8..58eba0aa1e0415ef4de57ac89f861cb63627b552 100644 (file)
--- a/include/wx/motif/bmpmotif.h
+++ b/include/wx/motif/bmpmotif.h
@@ -44,6 +44,8 @@ private:
     void InvalidateCache();
     void CreateImageIfNeeded( WXWidget w );
 
     void InvalidateCache();
     void CreateImageIfNeeded( WXWidget w );
 

+    WXPixmap GetPixmapFromCache(WXWidget w);
+

     struct
     {
         bool label  : 1;
     struct
     {
         bool label  : 1;

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index d0f70c18c4738ba6be7c7284d78bb5c4b4c963d3..4275b214fb047af2168528708287642344c2b72f 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -42,6 +42,11 @@
 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 

+static inline wxCharBuffer GetCacheImageName(WXImage image)
+{
+    return wxString::Format(_T("wxBitmap_%p"), image).ToAscii();
+}
+

 wxBitmapCache::~wxBitmapCache()
 {
     if( m_display )
 wxBitmapCache::~wxBitmapCache()
 {
     if( m_display )


@@ -113,12 +118,26 @@ void wxBitmapCache::CreateImageIfNeeded( WXWidget w )
 
     if( m_image )
     {
 
     if( m_image )
     {

-        char tmp[128];
-        sprintf( tmp, "Im%x", (unsigned int)ximage );
-        XmInstallImage( ximage, tmp );
+        XmInstallImage( ximage, GetCacheImageName(m_image).data() );

     }
 }
 
     }
 }
 

+WXPixmap wxBitmapCache::GetPixmapFromCache(WXWidget w)
+{
+    Widget widget = (Widget)w;
+    while( XmIsGadget( widget ) )
+        widget = XtParent( widget );
+
+    Pixel fg, bg;
+    XtVaGetValues( widget,
+                   XmNbackground, &bg,
+                   XmNforeground, &fg,
+                   NULL );
+
+    Screen* screen = DefaultScreenOfDisplay( (Display*)m_display );
+    return (WXPixmap)XmGetPixmap(screen, GetCacheImageName(m_image).data(), fg, bg);
+}
+

 WXPixmap wxBitmapCache::GetLabelPixmap( WXWidget w )
 {
     if( m_labelPixmap && !m_recalcPixmaps.label )
 WXPixmap wxBitmapCache::GetLabelPixmap( WXWidget w )
 {
     if( m_labelPixmap && !m_recalcPixmaps.label )


@@ -134,21 +153,7 @@ WXPixmap wxBitmapCache::GetLabelPixmap( WXWidget w )
     if( !m_image )
         return (WXPixmap)NULL;
 
     if( !m_image )
         return (WXPixmap)NULL;
 

-    char tmp[128];
-    sprintf( tmp, "Im%x", (unsigned int)m_image );
-
-    Pixel fg, bg;
-    Widget widget = (Widget)w;
-
-    while( XmIsGadget( widget ) )
-        widget = XtParent( widget );
-    XtVaGetValues( widget,
-                   XmNbackground, &bg,
-                   XmNforeground, &fg,
-                   NULL );
-
-    m_labelPixmap = (WXPixmap)XmGetPixmap( screen, tmp, fg, bg );
-
+    m_labelPixmap = GetPixmapFromCache(w);

     m_recalcPixmaps.label = !m_labelPixmap;
     return m_labelPixmap;
 }
     m_recalcPixmaps.label = !m_labelPixmap;
     return m_labelPixmap;
 }


@@ -168,19 +173,7 @@ WXPixmap wxBitmapCache::GetArmPixmap( WXWidget w )
     if( !m_image )
         return (WXPixmap)NULL;
 
     if( !m_image )
         return (WXPixmap)NULL;
 

-    char tmp[128];
-    sprintf( tmp, "Im%x", (unsigned int)m_image );
-
-    Pixel fg, bg;
-    Widget widget = (Widget) w;
-
-    XtVaGetValues( widget, XmNarmColor, &bg, NULL );
-    while( XmIsGadget( widget ) )
-        widget = XtParent( widget );
-    XtVaGetValues( widget, XmNforeground, &fg, NULL );
-
-    m_armPixmap = (WXPixmap)XmGetPixmap( screen, tmp, fg, bg );
-
+    m_armPixmap = GetPixmapFromCache(w);

     m_recalcPixmaps.arm = !m_armPixmap;
     return m_armPixmap;
 }
     m_recalcPixmaps.arm = !m_armPixmap;
     return m_armPixmap;
 }