Applied wxVScrolledWindow patch

[wxWidgets.git] / src / motif / bmpmotif.cpp

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 2ceb292b7fd9e06f72d8d9ed5754657fb517f5ce..2bd938cdab6ea712614ca9c029bfe7599c60c1b1 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -9,9 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bmpmotif.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __VMS
 #define XtParent XTPARENT
 
 #ifdef __VMS
 #define XtParent XTPARENT


@@ -34,10 +33,16 @@
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif

-#include <math.h>
+
+#include "wx/math.h"

 
 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 )


@@ -109,12 +114,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 )


@@ -130,21 +149,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;
 }


@@ -164,19 +169,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;
 }