Correct wxComboBox height in wxToolbar for old

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

diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index 1e9acde5673694e628ba961d26d37c8ce177bb5b..c01eeb8af8195e2b5a7f149a9fc84cd695e1e246 100644 (file)
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -9,8 +9,86 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XShapeQueryExtension XSHAPEQUERYEXTENSION
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/x11/privx.h"
 
 #include "wx/x11/privx.h"
 

+#ifdef HAVE_XSHAPE
+
+    #ifndef WX_PRECOMP
+        #include "wx/bitmap.h"
+        #include "wx/region.h"
+    #endif
+
+    #ifdef __VMS
+        #include "wx/vms_x_fix.h"
+        #include <X11/shape.h>
+    #else
+        #include <X11/extensions/shape.h>
+    #endif
+
+    #include "wx/dcmemory.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// XShape code
+// ----------------------------------------------------------------------------
+
+#ifdef HAVE_XSHAPE
+
+bool wxDoSetShape( Display* xdisplay,
+                   Window xwindow,
+                   const wxRegion& region )
+{
+    int dummy1, dummy2;
+
+    if( !XShapeQueryExtension( xdisplay, &dummy1, &dummy2 ) )
+        return false;
+
+    if( region.IsEmpty() )
+    {
+        XShapeCombineMask( xdisplay, xwindow, ShapeBounding, 0, 0,
+                           None, ShapeSet );
+    }
+    else
+    {
+        // wxRegion::ConvertToBitmap gives us the wrong Pixmap:
+        // polichrome and with black and whire reversed
+        wxRect box = region.GetBox();
+        wxBitmap bmp(box.GetRight(), box.GetBottom(), 1);
+        wxMemoryDC dc;
+        dc.SelectObject(bmp);
+        dc.SetBackground(*wxBLACK_BRUSH);
+        dc.Clear();
+        dc.SetClippingRegion(region);
+        dc.SetBackground(*wxWHITE_BRUSH);
+        dc.Clear();
+        dc.SelectObject(wxNullBitmap);
+
+        XShapeCombineMask( xdisplay, xwindow, ShapeBounding, 0, 0,
+                           (Pixmap)bmp.GetDrawable(), ShapeSet );
+    }
+
+    return true;
+}
+
+#else
+
+bool wxDoSetShape( Display* WXUNUSED(xdisplay),
+                   Window WXUNUSED(xwindow),
+                   const wxRegion& WXUNUSED(region) )
+{
+    return false;
+}
+
+#endif
+

 // ----------------------------------------------------------------------------
 // wxXVisualInfo
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxXVisualInfo
 // ----------------------------------------------------------------------------


@@ -110,7 +188,7 @@ void wxXVisualInfo::Init( Display* dpy, XVisualInfo* vi )
     XColor* colors = (XColor*) m_visualColormap;
 
     for (int i = 0; i < m_visualColormapSize; i++)
     XColor* colors = (XColor*) m_visualColormap;
 
     for (int i = 0; i < m_visualColormapSize; i++)

-           colors[i].pixel = i;
+        colors[i].pixel = i;

 
     XQueryColors( dpy, DefaultColormap(dpy, vi->screen),
                   colors, m_visualColormapSize );
 
     XQueryColors( dpy, DefaultColormap(dpy, vi->screen),
                   colors, m_visualColormapSize );


@@ -152,7 +230,7 @@ void wxXVisualInfo::Init( Display* dpy, XVisualInfo* vi )
                     index |= (g >> (5 - m_visualGreenPrec)) << m_visualGreenShift;
                     index |= (b >> (5 - m_visualBluePrec)) << m_visualBlueShift;
                 }
                     index |= (g >> (5 - m_visualGreenPrec)) << m_visualGreenShift;
                     index |= (b >> (5 - m_visualBluePrec)) << m_visualBlueShift;
                 }

-                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+                m_colorCube[ (r*1024) + (g*32) + b ] = (unsigned char)index;

             }
         }
     }
             }
         }
     }