use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 3459154e7fd3be7bd4b3079c14a301858deb767c..b8276477c31d7d272159e320e021034fd7771478 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -36,18 +36,20 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dcclient.h"
 #endif
 
     #pragma implementation "dcclient.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/image.h"
 #include "wx/log.h"

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

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -83,9 +85,18 @@ static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti;
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+
+#ifndef IS_HATCH
+    // IS_HATCH exists for WXWIN_COMPATIBILITY_2_4 only
+    // but wxMotif needs it for its internals here
+    #define IS_HATCH(s)    ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
+#endif
+
+// FIXME: left over after removal of wxDC::GetOptimization()
+#define GET_OPTIMIZATION false

 
 // ----------------------------------------------------------------------------
 // prototypes
 
 // ----------------------------------------------------------------------------
 // prototypes


@@ -126,7 +137,7 @@ static int roundmin(double a, double b)
 // wxWindowDC
 // ----------------------------------------------------------------------------
 
 // wxWindowDC
 // ----------------------------------------------------------------------------
 

-wxWindowDC::wxWindowDC()
+void wxWindowDC::Init()

 {
     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;
 {
     m_gc = (WXGC) 0;
     m_gcBacking = (WXGC) 0;


@@ -138,37 +149,29 @@ wxWindowDC::wxWindowDC()
     m_currentPenDash = (wxX11Dash*) NULL;
     m_currentStyle = -1;
     m_currentFill = -1;
     m_currentPenDash = (wxX11Dash*) NULL;
     m_currentStyle = -1;
     m_currentFill = -1;

-    //    m_currentBkMode = wxTRANSPARENT;

     m_colour = wxColourDisplay();
     m_display = (WXDisplay*) NULL;
     m_colour = wxColourDisplay();
     m_display = (WXDisplay*) NULL;

-    m_currentRegion = (WXRegion) 0;
-    m_userRegion = (WXRegion) 0;

     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_oldFont = (WXFont) 0;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_oldFont = (WXFont) 0;

+    m_ok = false;
+    m_clipRegion = (WXRegion) 0;
+}
+
+wxWindowDC::wxWindowDC()
+{
+    Init();

 }
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
     wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." );
 
 }
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
     wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDC/wxClientDC/wxPaintDC constructor." );
 

+    Init();
+

     m_window = window;
     m_font = window->GetFont();
     m_window = window;
     m_font = window->GetFont();

-    m_gc = (WXGC) 0;
-    m_gcBacking = (WXGC) 0;
-    m_backgroundPixel = -1;
-    m_currentPenWidth = 1;
-    m_currentPenJoin = -1;
-    m_currentPenDashCount = -1;
-    m_currentPenDash = (wxX11Dash*) NULL;
-    m_currentStyle = -1;
-    m_currentFill = -1;
-    //    m_currentBkMode = wxTRANSPARENT;
-    m_colour = wxColourDisplay();
-    m_currentRegion = (WXRegion) 0;
-    m_userRegion = (WXRegion) 0;
-    m_ok = TRUE;
-    m_autoSetting = 0;
+    m_ok = true;

 
     m_display = window->GetXDisplay();
     m_pixmap = window->GetXWindow();
 
     m_display = window->GetXDisplay();
     m_pixmap = window->GetXWindow();


@@ -222,16 +225,12 @@ wxWindowDC::~wxWindowDC()
         XFreeGC ((Display*) m_display, (GC) m_gcBacking);
     m_gcBacking = (WXGC) 0;
 
         XFreeGC ((Display*) m_display, (GC) m_gcBacking);
     m_gcBacking = (WXGC) 0;
 

-    if (m_currentRegion)
-        XDestroyRegion ((Region) m_currentRegion);
-    m_currentRegion = (WXRegion) 0;
-
-    if (m_userRegion)
-        XDestroyRegion ((Region) m_userRegion);
-    m_userRegion = (WXRegion) 0;
+    if (m_clipRegion)
+        XDestroyRegion ((Region) m_clipRegion);
+    m_clipRegion = (WXRegion) 0;

 }
 
 }
 

-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,


@@ -239,7 +238,7 @@ bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
 {
     return wxDoFloodFill(this, x, y, col, style);
 }
 {
     return wxDoFloodFill(this, x, y, col, style);
 }

-  
+

 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {
     // Generic (and therefore rather inefficient) method.
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {
     // Generic (and therefore rather inefficient) method.


@@ -251,7 +250,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));

-    return TRUE;
+    return true;

 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )


@@ -260,8 +259,6 @@ void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 
     int x1d, y1d, x2d, y2d;
 
 
     int x1d, y1d, x2d, y2d;
 

-    //  FreeGetPixelCache();
-

     x1d = XLOG2DEV(x1);
     y1d = YLOG2DEV(y1);
     x2d = XLOG2DEV(x2);
     x1d = XLOG2DEV(x1);
     y1d = YLOG2DEV(y1);
     x2d = XLOG2DEV(x2);


@@ -314,8 +311,6 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     int xx1 = XLOG2DEV (x1);
     int yy1 = YLOG2DEV (y1);
     int xx2 = XLOG2DEV (x2);
     int xx1 = XLOG2DEV (x1);
     int yy1 = YLOG2DEV (y1);
     int xx2 = XLOG2DEV (x2);


@@ -415,7 +410,7 @@ void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord
 
     if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
     {
 
     if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
     {

-        m_autoSetting = TRUE;    // must be reset
+        m_autoSetting = true;    // must be reset

 
         SetBrush (m_brush);
         XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);
 
         SetBrush (m_brush);
         XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);


@@ -442,8 +437,6 @@ void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     if (m_pen.Ok() && m_autoSetting)
         SetPen (m_pen);
 
     if (m_pen.Ok() && m_autoSetting)
         SetPen (m_pen);
 


@@ -458,8 +451,6 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
     {
         if (m_autoSetting)
     if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT)
     {
         if (m_autoSetting)


@@ -493,8 +484,6 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[],
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     XPoint *xpoints1 = new XPoint[n + 1];
     XPoint *xpoints2 = new XPoint[n + 1];
     int i;
     XPoint *xpoints1 = new XPoint[n + 1];
     XPoint *xpoints2 = new XPoint[n + 1];
     int i;


@@ -546,8 +535,6 @@ void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord h
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     int xd, yd, wfd, hfd, wd, hd;
 
     xd = XLOG2DEV(x);
     int xd, yd, wfd, hfd, wd, hd;
 
     xd = XLOG2DEV(x);


@@ -591,8 +578,6 @@ void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wx
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    //  FreeGetPixelCache();
-

     // If radius is negative, it's a proportion of the smaller dimension.
 
     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
     // If radius is negative, it's a proportion of the smaller dimension.
 
     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);


@@ -747,8 +732,6 @@ void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wx
     }
     CalcBoundingBox (x, y);
     CalcBoundingBox (x + width, y + height);
     }
     CalcBoundingBox (x, y);
     CalcBoundingBox (x + width, y + height);

-
-

 }
 
 void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -768,8 +751,6 @@ void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
         width = - width ;
     }
 
         width = - width ;
     }
 

-    //  FreeGetPixelCache();
-

     static const int angle = 23040;
 
     int xd, yd, wd, hd;
     static const int angle = 23040;
 
     int xd, yd, wd, hd;


@@ -808,84 +789,25 @@ void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 
 bool wxWindowDC::CanDrawBitmap() const
 {
 
 bool wxWindowDC::CanDrawBitmap() const
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );
+    wxCHECK_MSG( Ok(), false, "invalid dc" );

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-#if 0
-void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
-{
-    //  FreeGetPixelCache();
-
-    // Be sure that foreground pixels (1) of
-    // the Icon will be painted with pen colour. [m_pen.SetColour()]
-    // Background pixels (0) will be painted with
-    // last selected background color. [::SetBackground]
-    if (m_pen.Ok() && m_autoSetting)
-        SetPen (m_pen);
-
-    int width, height;
-    Pixmap iconPixmap = (Pixmap) icon.GetDrawable();
-    width = icon.GetWidth();
-    height = icon.GetHeight();
-    if (icon.GetDisplay() == m_display)
-    {
-        if (icon.GetDepth() <= 1)
-        {
-            XCopyPlane  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-                0, 0, width, height,
-                (int) XLOG2DEV (x), (int) YLOG2DEV (y), 1);
-        }
-        else
-        {
-            XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-                0, 0, width, height,
-                (int) XLOG2DEV (x), (int) YLOG2DEV (y));
-        }
-
-
-        if (m_window && m_window->GetBackingPixmap())
-        {
-            if (icon.GetDepth() <= 1)
-            {
-                XCopyPlane ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-                    0, 0, width, height, (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), 1);
-            }
-            else
-            {
-                XCopyArea  ((Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
-                    0, 0, width, height,
-                    (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y));
-            }
-        }
-    } else { /* Remote copy (different (Display*) m_displays) */
-        XImage *cache = NULL;
-        if (m_window && m_window->GetBackingPixmap())
-            XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_window->GetBackingPixmap(),
-            (GC) m_gcBacking, 0, 0, width, height,
-            (int) XLOG2DEV_2 (x), (int) YLOG2DEV_2 (y), TRUE, &cache);
-        XCopyRemote((Display*) icon.GetDisplay(), (Display*) m_display, iconPixmap, (Pixmap) m_pixmap, (GC) m_gc,
-            0, 0, width, height,
-            (int) XLOG2DEV (x), (int) YLOG2DEV (y), FALSE, &cache);
-    }
-    CalcBoundingBox (x, y);
-}
-#endif // 0
-
-// TODO: use scaled Blit e.g. as per John Price's implementation in Contrib/Utilities
-bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                         wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
+// TODO: use scaled Blit e.g. as per John Price's implementation
+// in Contrib/Utilities
+bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
+                         wxCoord width, wxCoord height,
+                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                         int rop, bool useMask,

                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );
+    wxCHECK_MSG( Ok(), false, "invalid dc" );

 
     wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC);
 
     wxASSERT_MSG( sourceDC, "Blit source DC must be wxWindowDC or derived class." );
 
 
     wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC);
 
     wxASSERT_MSG( sourceDC, "Blit source DC must be wxWindowDC or derived class." );
 

-    //  FreeGetPixelCache();
-

     // Be sure that foreground pixels (1) of the Icon will be painted with
     // foreground colour. [m_textForegroundColour] Background pixels (0)
     // will be painted with backgound colour (m_textBackgroundColour)
     // Be sure that foreground pixels (1) of the Icon will be painted with
     // foreground colour. [m_textForegroundColour] Background pixels (0)
     // will be painted with backgound colour (m_textBackgroundColour)


@@ -909,8 +831,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,

-                            m_textForegroundColour, TRUE);
- 
+                            m_textForegroundColour, true);
+

         int pixel = m_textForegroundColour.GetPixel();
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
         int pixel = m_textForegroundColour.GetPixel();
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);


@@ -922,7 +844,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);
     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);

-    bool retVal = FALSE;
+    bool retVal = false;

 
     /* TODO: use the mask origin when drawing transparently */
     if (xsrcMask == -1 && ysrcMask == -1)
 
     /* TODO: use the mask origin when drawing transparently */
     if (xsrcMask == -1 && ysrcMask == -1)


@@ -976,7 +898,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),

-                TRUE, &cache);
+                True, &cache);

 
             if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
             {
 
             if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
             {


@@ -995,17 +917,22 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV (xdest), YLOG2DEV (ydest),
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV (xdest), YLOG2DEV (ydest),

-                FALSE, &cache);
+                False, &cache);

 
             if ( useMask )
             {
 
             if ( useMask )
             {

-                XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+                if ( m_clipRegion )
+                    XSetRegion ((Display*) m_display, (GC) m_gc,
+                                (Region) m_clipRegion);
+                else
+                    XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+

                 XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
             }
 
         } else
         {        //XGCValues values;
                 XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
             }
 
         } else
         {        //XGCValues values;

-        //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);   
+        //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);

 
             if (m_window && m_window->GetBackingPixmap())
             {
 
             if (m_window && m_window->GetBackingPixmap())
             {


@@ -1063,7 +990,12 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
             }
             if ( useMask )
             {
             }
             if ( useMask )
             {

-                XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+                if ( m_clipRegion )
+                    XSetRegion ((Display*) m_display, (GC) m_gc,
+                                (Region) m_clipRegion);
+                else
+                    XSetClipMask   ((Display*) m_display, (GC) m_gc, None);
+

                 XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
             }
 
                 XSetClipOrigin ((Display*) m_display, (GC) m_gc, 0, 0);
             }
 


@@ -1073,7 +1005,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
 
         SetLogicalFunction(orig);
 
 
         SetLogicalFunction(orig);
 

-        retVal = TRUE;
+        retVal = true;

   }
   if (scaledBitmap) delete scaledBitmap;
 
   }
   if (scaledBitmap) delete scaledBitmap;
 


@@ -1103,7 +1035,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     int cx = 0;
     int cy = 0;
     int ascent = 0;
     int cx = 0;
     int cy = 0;
     int ascent = 0;

-    int slen;
+    int slen = text.length();

 
     // Set FillStyle, otherwise X will use current stipple!
     XGCValues gcV, gcBackingV;
 
     // Set FillStyle, otherwise X will use current stipple!
     XGCValues gcV, gcBackingV;


@@ -1117,27 +1049,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         XSetFillStyle ((Display*) m_display, (GC) m_gcBacking, FillSolid);
     }
 
         XSetFillStyle ((Display*) m_display, (GC) m_gcBacking, FillSolid);
     }
 

-    slen = strlen(text);
-

     if (m_font.Ok())
     if (m_font.Ok())

-    {
-        WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-        int direction, descent;
-        XCharStruct overall_return;
-#if 0
-        if (use16)
-            (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction,
-            &ascent, &descent, &overall_return);
-        else
-#endif // 0
-            (void)XTextExtents((XFontStruct*) pFontStruct,
-                               wxConstCast(text.c_str(), char),
-                               slen, &direction,
-                               &ascent, &descent, &overall_return);
-
-        cx = overall_return.width;
-        cy = ascent + descent;
-    }
+        wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                         text, &cx, &cy, &ascent, NULL);

 
     // First draw a rectangle representing the text background, if a text
     // background is specified
 
     // First draw a rectangle representing the text background, if a text
     // background is specified


@@ -1155,7 +1069,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         sameColour = (sameColour &&
             (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
 
         sameColour = (sameColour &&
             (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
 

-        if (!sameColour || !GetOptimization())
+        if (!sameColour || !GET_OPTIMIZATION)

         {
             int pixel = m_textBackgroundColour.AllocColour(m_display);
             m_currentColour = m_textBackgroundColour;
         {
             int pixel = m_textBackgroundColour.AllocColour(m_display);
             m_currentColour = m_textBackgroundColour;


@@ -1188,10 +1102,10 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             (oldPenColour.Green () == m_currentColour.Green ()) &&
             (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 
             (oldPenColour.Green () == m_currentColour.Green ()) &&
             (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 

-        if (!sameColour || !GetOptimization())
+        if (!sameColour || !GET_OPTIMIZATION)

         {
             int pixel = CalculatePixel(m_textForegroundColour,
         {
             int pixel = CalculatePixel(m_textForegroundColour,

-                                       m_currentColour, FALSE);
+                                       m_currentColour, false);

 
             // Set the GC to the required colour
             if (pixel > -1)
 
             // Set the GC to the required colour
             if (pixel > -1)


@@ -1213,7 +1127,12 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         (XChar2b *)(char*) (const char*) text, slen);
     else
 #endif // 0
         (XChar2b *)(char*) (const char*) text, slen);
     else
 #endif // 0

+#if wxMOTIF_NEW_FONT_HANDLING
+        XFontSet fset = (XFontSet) m_font.GetFontSet (m_userScaleY * m_logicalScaleY, m_display);
+        XmbDrawString((Display*) m_display, (Pixmap) m_pixmap, fset, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);
+#else

         XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);
         XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);

+#endif

 
     if (m_window && m_window->GetBackingPixmap()) {
 #if 0
 
     if (m_window && m_window->GetBackingPixmap()) {
 #if 0


@@ -1223,9 +1142,15 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             (XChar2b *)(char*) (const char*) text, slen);
         else
 #endif // 0
             (XChar2b *)(char*) (const char*) text, slen);
         else
 #endif // 0

+#if wxMOTIF_NEW_FONT_HANDLING
+            XmbDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), fset, (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
+                        wxConstCast(text.c_str(), char), slen);
+#else

             XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
                         wxConstCast(text.c_str(), char), slen);
             XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
                         wxConstCast(text.c_str(), char), slen);

+#endif

     }
 
     // restore fill style
     }
 
     // restore fill style


@@ -1267,8 +1192,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,

-                            m_textForegroundColour, TRUE);
- 
+                            m_textForegroundColour, true);
+

         foregroundPixel = m_textForegroundColour.GetPixel();
     }
 
         foregroundPixel = m_textForegroundColour.GetPixel();
     }
 


@@ -1276,31 +1201,10 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     int cx = 0;
     int cy = 0;
     int ascent = 0;
     int cx = 0;
     int cy = 0;
     int ascent = 0;

-    int slen = text.length();

 
     if (m_font.Ok())
 
     if (m_font.Ok())

-    {
-        // Calculate text extent.
-        WXFontStructPtr pFontStruct =
-            m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-        int direction, descent;
-        XCharStruct overall_return;
-#if 0
-        if (use16)
-            (void)XTextExtents16((XFontStruct*) pFontStruct,
-                                 (XChar2b *)(const char*) text,
-                                 slen, &direction,
-            &ascent, &descent, &overall_return);
-        else
-#endif // 0
-            (void)XTextExtents((XFontStruct*) pFontStruct,
-                               wxConstCast(text.c_str(), char),
-                               slen, &direction,
-                               &ascent, &descent, &overall_return);
-
-        cx = overall_return.width;
-        cy = ascent + descent;
-    }
+        wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                         text, &cx, &cy, &ascent, NULL);

 
     wxBitmap src(cx, cy);
     wxMemoryDC dc;
 
     wxBitmap src(cx, cy);
     wxMemoryDC dc;


@@ -1399,7 +1303,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
 bool wxWindowDC::CanGetTextExtent() const
 {
 
 bool wxWindowDC::CanGetTextExtent() const
 {

-    return TRUE;
+    return true;

 }
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
 }
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,


@@ -1408,9 +1312,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    wxFont* theFont = font;
-    if (!theFont)
-        theFont = (wxFont *)&m_font; // const_cast
+    const wxFont* theFont = font ? font : &m_font;

 
     if (!theFont->Ok())
     {
 
     if (!theFont->Ok())
     {


@@ -1422,33 +1324,11 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
         return;
     }
 
         return;
     }
 

-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-
-    int direction, ascent, descent2;
-    XCharStruct overall;
-    int slen;
+    wxGetTextExtent(m_display, *theFont, m_userScaleY * m_logicalScaleY,
+                    string, width, height, NULL, descent);

 
 

-#if 0
-    if (use16)
-        slen = str16len(string);
-    else
-#endif // 0
-        slen = strlen(string);
-
-#if 0
-    if (use16)
-        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-        &ascent, &descent2, &overall);
-    else
-#endif // 0
-        XTextExtents((XFontStruct*) pFontStruct,
-                     wxConstCast(string.c_str(), char), slen, &direction,
-        &ascent, &descent2, &overall);
-
-    if (width) *width = XDEV2LOGREL (overall.width);
-    if (height) *height = YDEV2LOGREL (ascent + descent2);
-    if (descent)
-        *descent = descent2;
+    if (width) *width = XDEV2LOGREL (*width);
+    if (height) *height = YDEV2LOGREL (*height);

     if (externalLeading)
         *externalLeading = 0;
 }
     if (externalLeading)
         *externalLeading = 0;
 }


@@ -1457,14 +1337,13 @@ wxCoord wxWindowDC::GetCharWidth() const
 {
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 {
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );

+    
+    int width;

 
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY * m_logicalScaleY, m_display);
+    wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                     "x", &width, NULL, NULL, NULL);

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-    return XDEV2LOGREL(overall.width);
+    return XDEV2LOGREL(width);

 }
 
 wxCoord wxWindowDC::GetCharHeight() const
 }
 
 wxCoord wxWindowDC::GetCharHeight() const


@@ -1472,52 +1351,39 @@ wxCoord wxWindowDC::GetCharHeight() const
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+    int height;

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-    //  return XDEV2LOGREL(overall.ascent + overall.descent);
-    return XDEV2LOGREL(ascent + descent);
+    wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                     "x", NULL, &height, NULL, NULL);
+
+    return XDEV2LOGREL(height);

 }
 
 }
 

-void wxWindowDC::Clear()
+void wxWindowDC::DoGetSize( int *width, int *height ) const

 {
 {

-    wxCHECK_RET( Ok(), "invalid dc" );
+    int w = 0, h = 0;

 
 

-    int w, h;
-    if (m_window)
+    if( m_window )

     {
     {

-        m_window->GetSize(&w, &h);
-
-        if (m_window && m_window->GetBackingPixmap())
+        if( m_window->GetBackingPixmap() )

         {
             w = m_window->GetPixmapWidth();
             h = m_window->GetPixmapHeight();
         }
         {
             w = m_window->GetPixmapWidth();
             h = m_window->GetPixmapHeight();
         }

-    }
-    else
-    {
-        if (this->IsKindOf(CLASSINFO(wxMemoryDC)))
-        {
-            wxMemoryDC* memDC = (wxMemoryDC*) this;
-            w = memDC->GetBitmap().GetWidth();
-            h = memDC->GetBitmap().GetHeight();
-        }

         else
         else

-            return;
+            m_window->GetSize( &w, &h );

     }
 
     }
 

-    wxBrush saveBrush = m_brush;
-    SetBrush (m_backgroundBrush);
-
-    XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, 0, 0, w, h);
+    if( width ) *width = w;
+    if( height ) *height = h;
+}

 
 

-    if (m_window && m_window->GetBackingPixmap())
-        XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, 0, 0, w, h);
+void wxWindowDC::Clear()
+{
+    wxCHECK_RET( Ok(), "invalid dc" );

 
 

-    m_brush = saveBrush;
+    wxRect rect( GetSize() );
+    Clear( rect );

 }
 
 void wxWindowDC::Clear(const wxRect& rect)
 }
 
 void wxWindowDC::Clear(const wxRect& rect)


@@ -1530,10 +1396,13 @@ void wxWindowDC::Clear(const wxRect& rect)
     wxBrush saveBrush = m_brush;
     SetBrush (m_backgroundBrush);
 
     wxBrush saveBrush = m_brush;
     SetBrush (m_backgroundBrush);
 

-    XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, x, y, w, h);
+    XFillRectangle ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc,
+                    x, y, w, h);

 
     if (m_window && m_window->GetBackingPixmap())
 
     if (m_window && m_window->GetBackingPixmap())

-        XFillRectangle ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, x, y, w, h);
+        XFillRectangle ((Display*) m_display,
+                        (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking,
+                        x, y, w, h);

 
     m_brush = saveBrush;
 }
 
     m_brush = saveBrush;
 }


@@ -1556,6 +1425,7 @@ void wxWindowDC::SetFont( const wxFont &font )
         return;
     }
 
         return;
     }
 

+#if !wxMOTIF_NEW_FONT_HANDLING

     WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
 
     Font fontId = ((XFontStruct*)pFontStruct)->fid;
     WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
 
     Font fontId = ((XFontStruct*)pFontStruct)->fid;


@@ -1563,6 +1433,7 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     if (m_window && m_window->GetBackingPixmap())
         XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);
 
     if (m_window && m_window->GetBackingPixmap())
         XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);

+#endif

 }
 
 void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
 }
 
 void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)


@@ -1589,7 +1460,7 @@ int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
                                bool roundToWhite) const
 {
     const unsigned char wp = (unsigned char)255;
                                bool roundToWhite) const
 {
     const unsigned char wp = (unsigned char)255;

-        
+

     int pixel = -1;
     if(!m_colour) // Mono display
     {
     int pixel = -1;
     if(!m_colour) // Mono display
     {


@@ -1670,7 +1541,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
         (oldPenColour.Green () == m_currentColour.Green ()) &&
         (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 
         (oldPenColour.Green () == m_currentColour.Green ()) &&
         (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 

-    if (!sameStyle || !GetOptimization())
+    if (!sameStyle || !GET_OPTIMIZATION)

     {
         int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
         if (scaled_width < 0)
     {
         int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
         if (scaled_width < 0)


@@ -1783,7 +1654,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);
     }
 
             XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);
     }
 

-    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
+    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GET_OPTIMIZATION))

     {
         Pixmap myStipple;
 
     {
         Pixmap myStipple;
 


@@ -1841,7 +1712,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
     }
     else if (m_currentStipple.Ok()
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
     }
     else if (m_currentStipple.Ok()

-        && ((m_currentStipple != oldStipple) || !GetOptimization()))
+        && ((m_currentStipple != oldStipple) || !GET_OPTIMIZATION))

     {
         XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
 
     {
         XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
 


@@ -1849,7 +1720,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable());
     }
 
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable());
     }
 

-    if ((m_currentFill != oldFill) || !GetOptimization())
+    if ((m_currentFill != oldFill) || !GET_OPTIMIZATION)

     {
         int fill_style;
 
     {
         int fill_style;
 


@@ -1865,7 +1736,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
     }
 
     // must test m_logicalFunction, because it involves background!
     }
 
     // must test m_logicalFunction, because it involves background!

-    if (!sameColour || !GetOptimization()
+    if (!sameColour || !GET_OPTIMIZATION

         || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
     {
         int pixel = -1;
         || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
     {
         int pixel = -1;


@@ -1873,7 +1744,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             pixel = m_backgroundPixel;
         else
         {
             pixel = m_backgroundPixel;
         else
         {

-            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, FALSE);
+            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, false);

         }
 
         // Finally, set the GC to the required colour
         }
 
         // Finally, set the GC to the required colour


@@ -1915,7 +1786,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
 
     int stippleDepth = -1;
 
 
     int stippleDepth = -1;
 

-    if ((oldFill != m_brush.GetStyle ()) || !GetOptimization())
+    if ((oldFill != m_brush.GetStyle ()) || !GET_OPTIMIZATION)

     {
         switch (brush.GetStyle ())
         {
     {
         switch (brush.GetStyle ())
         {


@@ -1937,7 +1808,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
                 // determine whether fill style should be solid or
                 // transparent
                 int style = stippleDepth == 1 ?
                 // determine whether fill style should be solid or
                 // transparent
                 int style = stippleDepth == 1 ?

-                    (m_backgroundMode == wxSOLID ? 
+                    (m_backgroundMode == wxSOLID ?

                      FillOpaqueStippled : FillStippled) :
                     FillTiled;
                 XSetFillStyle ((Display*) m_display, (GC) m_gc, style);
                      FillOpaqueStippled : FillStippled) :
                     FillTiled;
                 XSetFillStyle ((Display*) m_display, (GC) m_gc, style);


@@ -1954,7 +1825,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
         }
     }
 
         }
     }
 

-    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
+    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GET_OPTIMIZATION))

     {
         Pixmap myStipple;
 
     {
         Pixmap myStipple;
 


@@ -2033,10 +1904,10 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     }
 
     // must test m_logicalFunction, because it involves background!
     }
 
     // must test m_logicalFunction, because it involves background!

-    if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR)
+    if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)

     {
     {

-        int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, TRUE);
- 
+        int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
+

         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }


@@ -2055,14 +1926,6 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
 
     m_backgroundPixel = m_backgroundBrush.GetColour().AllocColour(m_display);
 
 
     m_backgroundPixel = m_backgroundBrush.GetColour().AllocColour(m_display);
 

-    // New behaviour, 10/2/99: setting the background brush of a DC
-    // doesn't affect the window background colour.
-/*
-    // XSetWindowBackground doesn't work for non-Window pixmaps
-    if (!this->IsKindOf(CLASSINFO(wxMemoryDC)))
-        XSetWindowBackground ((Display*) m_display, (Pixmap) m_pixmap, pixel);
-*/
-

     // Necessary for ::DrawIcon, which use fg/bg pixel or the GC.
     // And Blit,... (Any fct that use XCopyPlane, in fact.)
     XSetBackground ((Display*) m_display, (GC) m_gc, m_backgroundPixel);
     // Necessary for ::DrawIcon, which use fg/bg pixel or the GC.
     // And Blit,... (Any fct that use XCopyPlane, in fact.)
     XSetBackground ((Display*) m_display, (GC) m_gc, m_backgroundPixel);


@@ -2150,23 +2013,14 @@ void wxWindowDC::SetTextForeground( const wxColour &col )
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    if (m_textForegroundColour == col)
-        return;
-

     m_textForegroundColour = col;
     m_textForegroundColour = col;

-

 }
 
 void wxWindowDC::SetTextBackground( const wxColour &col )
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 }
 
 void wxWindowDC::SetTextBackground( const wxColour &col )
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    if (m_textBackgroundColour == col)
-        return;
-

     m_textBackgroundColour = col;
     m_textBackgroundColour = col;

-    if (!m_textBackgroundColour.Ok())
-        return;

 }
 
 void wxWindowDC::SetBackgroundMode( int mode )
 }
 
 void wxWindowDC::SetBackgroundMode( int mode )


@@ -2189,57 +2043,54 @@ void wxWindowDC::SetPalette( const wxPalette& palette )
     }
 }
 
     }
 }
 

-// Helper function
-void wxWindowDC::SetDCClipping()
+static void wxCopyRegion( WXRegion src, WXRegion& dst )

 {
 {

-    // m_userRegion is the region set by calling SetClippingRegion
-
-    if (m_currentRegion)
-        XDestroyRegion ((Region) m_currentRegion);
-
-    // We need to take into account
-    // clipping imposed on a window by a repaint.
-    // We'll combine it with the user region. But for now,
-    // just use the currently-defined user clipping region.
-    if (m_userRegion || (m_window && m_window->GetUpdateRegion().Ok()) )
-        m_currentRegion = (WXRegion) XCreateRegion ();
-    else
-        m_currentRegion = (WXRegion) NULL;
-
-    if ((m_window && m_window->GetUpdateRegion().Ok()) && m_userRegion)
-        XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_userRegion, (Region) m_currentRegion);
-    else if (m_userRegion)
-        XIntersectRegion ((Region) m_userRegion, (Region) m_userRegion, (Region) m_currentRegion);
-    else if (m_window && m_window->GetUpdateRegion().Ok())
-        XIntersectRegion ((Region) m_window->GetUpdateRegion().GetXRegion(), (Region) m_window->GetUpdateRegion().GetXRegion(),
-        (Region) m_currentRegion);
+    if( !dst )
+        dst = XCreateRegion();
+    XUnionRegion( (Region)src, (Region)src, (Region)dst );
+}

 
 

-    if (m_currentRegion)
+// Helper function; userRegion is the region set by calling SetClippingRegion
+void wxWindowDC::SetDCClipping( WXRegion userRegion )
+{
+    bool hasUpdateRegion = m_window && m_window->GetUpdateRegion().Ok();
+    // this means that we should start the clip region from scratch,
+    // or from the update region, if any
+    if( !userRegion )

     {
     {

-        XSetRegion ((Display*) m_display, (GC) m_gc, (Region) m_currentRegion);
+        if( m_clipRegion )
+            XDestroyRegion( (Region)m_clipRegion );
+        m_clipRegion = (WXRegion)NULL;
+
+        if( hasUpdateRegion )
+            wxCopyRegion( m_window->GetUpdateRegion().GetX11Region(),
+                          m_clipRegion );

     }
     }

-    else
+    // intersect the user region, if any, with the
+    // exisiting clip region
+    else // if( userRegion )

     {
     {

-        XSetClipMask ((Display*) m_display, (GC) m_gc, None);
+        if( !m_clipRegion )
+            wxCopyRegion( userRegion, m_clipRegion );
+        else
+            XIntersectRegion( (Region)m_clipRegion,
+                              (Region)userRegion, (Region)m_clipRegion );

     }
 
     }
 

+    if( m_clipRegion )
+        XSetRegion( (Display*)m_display, (GC)m_gc, (Region)m_clipRegion );
+    else
+        XSetClipMask( (Display*)m_display, (GC)m_gc, None );

 }
 
 }
 

-void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
+                                      wxCoord width, wxCoord height )

 {
     wxDC::DoSetClippingRegion( x, y, width, height );
 
 {
     wxDC::DoSetClippingRegion( x, y, width, height );
 

-    if (m_userRegion)
-        XDestroyRegion ((Region) m_userRegion);
-    m_userRegion = (WXRegion) XCreateRegion ();
-    XRectangle r;
-    r.x = XLOG2DEV (x);
-    r.y = YLOG2DEV (y);
-    r.width = XLOG2DEVREL(width);
-    r.height = YLOG2DEVREL(height);
-    XUnionRectWithRegion (&r, (Region) m_userRegion, (Region) m_userRegion);
+    wxRegion temp(x, y, width, height);

 
 

-    SetDCClipping ();
+    SetDCClipping(temp.GetX11Region());

 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94
 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94


@@ -2250,7 +2101,8 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoo
         rects[0].y = YLOG2DEV_2(y);
         rects[0].width = XLOG2DEVREL(width);
         rects[0].height = YLOG2DEVREL(height);
         rects[0].y = YLOG2DEV_2(y);
         rects[0].width = XLOG2DEVREL(width);
         rects[0].height = YLOG2DEVREL(height);

-        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted);
+        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
+                           0, 0, rects, 1, Unsorted);

     }
 }
 
     }
 }
 


@@ -2260,13 +2112,7 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 
     wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
 
 
     wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
 

-    if (m_userRegion)
-        XDestroyRegion ((Region) m_userRegion);
-    m_userRegion = (WXRegion) XCreateRegion ();
-
-    XUnionRegion((Region) m_userRegion, (Region) region.GetXRegion(), (Region) m_userRegion);
-
-    SetDCClipping ();
+    SetDCClipping(region.GetX11Region());

 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94
 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94


@@ -2277,7 +2123,8 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
         rects[0].y = YLOG2DEV_2(box.y);
         rects[0].width = XLOG2DEVREL(box.width);
         rects[0].height = YLOG2DEVREL(box.height);
         rects[0].y = YLOG2DEV_2(box.y);
         rects[0].width = XLOG2DEVREL(box.width);
         rects[0].height = YLOG2DEVREL(box.height);

-        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking, 0, 0, rects, 1, Unsorted);
+        XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
+                           0, 0, rects, 1, Unsorted);

     }
 }
 
     }
 }
 


@@ -2286,21 +2133,16 @@ void wxWindowDC::DestroyClippingRegion()
 {
     wxDC::DestroyClippingRegion();
 
 {
     wxDC::DestroyClippingRegion();
 

-    if (m_userRegion)
-        XDestroyRegion ((Region) m_userRegion);
-    m_userRegion = NULL;
-
-    SetDCClipping ();
+    SetDCClipping(NULL);

 
 

-    XGCValues gc_val;
-    gc_val.clip_mask = None;

     if (m_window && m_window->GetBackingPixmap())
     if (m_window && m_window->GetBackingPixmap())

-        XChangeGC((Display*) m_display, (GC) m_gcBacking, GCClipMask, &gc_val);
+        XSetClipMask ((Display*) m_display, (GC) m_gcBacking, None);

 }
 
 // Resolution in pixels per logical inch
 wxSize wxWindowDC::GetPPI() const
 {
 }
 
 // Resolution in pixels per logical inch
 wxSize wxWindowDC::GetPPI() const
 {

+    // TODO

     return wxSize(100, 100);
 }
 
     return wxSize(100, 100);
 }
 


@@ -2319,51 +2161,15 @@ int wxWindowDC::GetDepth() const
 
 wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win)
 {
 
 wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win)
 {

-    wxRegion* region = NULL;
-
-    // Combine all the update rects into a region
-    const wxRectList& updateRects(win->GetUpdateRects());
-    if ( updateRects.GetCount() != 0 )
-    {
-        for ( wxRectList::Node *node = updateRects.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxRect* rect = node->GetData();
-
-            if (!region)
-                region = new wxRegion(*rect);
-            else
-                // TODO: is this correct? In SetDCClipping above,
-                // XIntersectRegion is used to combine paint and user
-                // regions. XIntersectRegion appears to work in that case...
-                region->Union(*rect);
-        }
-    }
-    else
-    {
-        int cw, ch;
-        win->GetClientSize(&cw, &ch);
-        region = new wxRegion(wxRect(0, 0, cw, ch));
-    }
-
-    win->SetUpdateRegion(*region);
-
-    wxRegion& theRegion(win->GetUpdateRegion());
-    theRegion.SetRects(updateRects); // We also store in terms of rects, for iteration to work.
-
-    // Set the clipping region. Any user-defined region will be combined with this
-    // one in SetDCClipping.
-    XSetRegion ((Display*) m_display, (GC) m_gc, (Region) region->GetXRegion());
-
-    delete region;
+    // Set the clipping region.to the update region
+    SetDCClipping((WXRegion)NULL);

 }
 
 wxPaintDC::~wxPaintDC()
 {
 }
 
 wxPaintDC::~wxPaintDC()
 {

-    XSetClipMask ((Display*) m_display, (GC) m_gc, None);

     if (m_window)
         m_window->ClearUpdateRegion();
     if (m_window)
         m_window->ClearUpdateRegion();

+    SetDCClipping((WXRegion)NULL);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2402,7 +2208,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display,
     destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);
 
     cache_pos = 0;
     destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);
 
     cache_pos = 0;

-    all_cache = FALSE;
+    all_cache = False;

 
     for (i = 0; i < w; i++)
         for (j = 0; j < h; j++) {
 
     for (i = 0; i < w; i++)
         for (j = 0; j < h; j++) {


@@ -2430,7 +2236,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display,
 
                         if (++cache_pos >= CACHE_SIZE) {
                             cache_pos = 0;
 
                         if (++cache_pos >= CACHE_SIZE) {
                             cache_pos = 0;

-                            all_cache = TRUE;
+                            all_cache = true;

                         }
 
 install:
                         }
 
 install: