#include "wx/log.h"
#include "wx/app.h"
#include "wx/window.h"
+ #include "wx/dcmemory.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
#endif
-#include "wx/dcmemory.h"
-#include "wx/image.h"
-#include "wx/math.h"
-
#ifdef __VMS__
#pragma message disable nosimpint
#endif
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
+#define IS_HATCH(s) ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
// FIXME: left over after removal of wxDC::GetOptimization()
#define GET_OPTIMIZATION false
gcvalues.graphics_exposures = False;
gcvalues.subwindow_mode = IncludeInferiors;
gcvalues.line_width = 1;
+#if !wxMOTIF_NEW_FONT_HANDLING
+ WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+ gcvalues.font = ((XFontStruct*)pFontStruct)->fid;
+#endif
m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
- GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+ GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode
+#if !wxMOTIF_NEW_FONT_HANDLING
+ | GCFont
+#endif
+ ,
&gcvalues);
if (m_window->GetBackingPixmap())
&gcvalues);
}
- m_backgroundPixel = (int) gcvalues.background;
+ m_backgroundPixel = gcvalues.background;
SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
}
// foreground colour. [m_textForegroundColour] Background pixels (0)
// will be painted with backgound colour (m_textBackgroundColour)
// Using ::SetPen is horribly slow, so avoid doing it
- int oldBackgroundPixel = -1;
- int oldForegroundPixel = -1;
+ WXPixel oldBackgroundPixel = -1;
+ WXPixel oldForegroundPixel = -1;
if (m_textBackgroundColour.Ok())
{
oldBackgroundPixel = m_backgroundPixel;
- int pixel = m_textBackgroundColour.AllocColour(m_display);
+ WXPixel pixel = m_textBackgroundColour.AllocColour(m_display);
XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
if (m_window && m_window->GetBackingPixmap())
CalculatePixel( m_textForegroundColour,
m_textForegroundColour, true);
- int pixel = m_textForegroundColour.GetPixel();
+ WXPixel pixel = m_textForegroundColour.GetPixel();
if (pixel > -1)
SetForegroundPixelWithLogicalFunction(pixel);
}
if (!sameColour || !GET_OPTIMIZATION)
{
- int pixel = m_textBackgroundColour.AllocColour(m_display);
+ WXPixel pixel = m_textBackgroundColour.AllocColour(m_display);
m_currentColour = m_textBackgroundColour;
// Set the GC to the required colour
if (!sameColour || !GET_OPTIMIZATION)
{
- int pixel = CalculatePixel(m_textForegroundColour,
- m_currentColour, false);
+ WXPixel pixel = CalculatePixel(m_textForegroundColour,
+ m_currentColour, false);
// Set the GC to the required colour
if (pixel > -1)
#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);
+ text.mb_str(), 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);
+ text.mb_str(), slen);
#endif
}
wxCHECK_RET( Ok(), "invalid dc" );
- int oldBackgroundPixel = -1;
- int oldForegroundPixel = -1;
- int foregroundPixel = -1;
- int backgroundPixel = -1;
+ WXPixel oldBackgroundPixel = -1;
+ WXPixel oldForegroundPixel = -1;
+ WXPixel foregroundPixel = -1;
+ WXPixel backgroundPixel = -1;
if (m_textBackgroundColour.Ok())
{
void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *font ) const
+ const wxFont *font ) const
{
wxCHECK_RET( Ok(), "invalid dc" );
#endif
}
-void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
+void wxWindowDC::SetForegroundPixelWithLogicalFunction(WXPixel pixel)
{
if (m_logicalFunction == wxXOR)
{
}
}
-int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
+WXPixel wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
bool roundToWhite) const
{
const unsigned char wp = (unsigned char)255;
- int pixel = -1;
+ WXPixel pixel = -1;
if(!m_colour) // Mono display
{
unsigned char red = colour.Red ();
((red != 0 || blue != 0 || green != 0) && roundToWhite))
{
curCol = *wxWHITE;
- pixel = (int)WhitePixel((Display*) m_display,
- DefaultScreen((Display*) m_display));
+ pixel = WhitePixel((Display*) m_display,
+ DefaultScreen((Display*) m_display));
curCol.SetPixel(pixel);
colour.SetPixel(pixel);
}
else
{
curCol = *wxBLACK;
- pixel = (int)BlackPixel((Display*) m_display,
- DefaultScreen((Display*) m_display));
+ pixel = BlackPixel((Display*) m_display,
+ DefaultScreen((Display*) m_display));
curCol.SetPixel(pixel);
colour.SetPixel(pixel);
}
if (m_window && m_window->GetBackingPixmap())
XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
}
- else if (m_currentStipple.Ok()
- && ((m_currentStipple != oldStipple) || !GET_OPTIMIZATION))
+ else if (m_currentStyle == wxSTIPPLE && m_currentStipple.Ok()
+ && ((!m_currentStipple.IsSameAs(oldStipple)) || !GET_OPTIMIZATION))
{
XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
if (!sameColour || !GET_OPTIMIZATION
|| ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
{
- int pixel = -1;
+ WXPixel pixel = -1;
if (m_pen.GetStyle () == wxTRANSPARENT)
pixel = m_backgroundPixel;
else
// must test m_logicalFunction, because it involves background!
if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
{
- int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
+ WXPixel pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
if (pixel > -1)
SetForegroundPixelWithLogicalFunction(pixel);
{
wxDC::DoSetClippingRegion( x, y, width, height );
- wxRegion temp(x, y, width, height);
+ wxRegion temp(XLOG2DEV(x), YLOG2DEV(y),
+ XLOG2DEVREL(width), YLOG2DEVREL(height));
SetDCClipping(temp.GetX11Region());
void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
{
- wxRect box = region.GetBox();
-
- wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
-
SetDCClipping(region.GetX11Region());
// Needs to work differently for Pixmap: without this,
// there's a nasty (Display*) m_display bug. 8/12/94
if (m_window && m_window->GetBackingPixmap())
{
+ wxRect box = region.GetBox();
+
XRectangle rects[1];
rects[0].x = (short)XLOG2DEV_2(box.x);
rects[0].y = (short)YLOG2DEV_2(box.y);
static const int CACHE_SIZE = 256;
unsigned int i, j;
- unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];
+ Pixel cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];
int k, cache_pos, all_cache;
if (!cache || !*cache)
for (i = 0; i < w; i++)
for (j = 0; j < h; j++) {
- unsigned long pixel;
+ Pixel pixel;
XColor xcol;
pixel = XGetPixel(image, i, j);
XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
XDestroyImage(destimage);
- if (more)
+ if (more && cache)
*cache = image;
else
XDestroyImage(image);
projects / wxWidgets.git / blobdiff