#endif
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcdlg.h"
#include "wx/image.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/dcmemory.h"
#include "wx/log.h"
#include "wx/icon.h"
+ #include "wx/dcprint.h"
+ #include "wx/module.h"
#endif
#include "wx/sysopt.h"
-#include "wx/dcprint.h"
-#include "wx/module.h"
#include "wx/dynlib.h"
#ifdef wxHAVE_RAW_BITMAP
#include <string.h>
-#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif
#ifndef AC_SRC_ALPHA
-#define AC_SRC_ALPHA 1
+ #define AC_SRC_ALPHA 1
+#endif
+
+#ifndef LAYOUT_RTL
+ #define LAYOUT_RTL 1
#endif
/* Quaternary raster codes */
DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
};
-// support for dynamic loading of msimg32.dll which we use for some functions
-class wxMSImg32DLL
+// helper class to cache dynamically loaded libraries and not attempt reloading
+// them if it fails
+class wxOnceOnlyDLLLoader
{
public:
- // return the symbol with the given name if the DLL not loaded or symbol
- // not present
- static void *GetSymbol(const wxChar *name)
+ // ctor argument must be a literal string as we don't make a copy of it!
+ wxOnceOnlyDLLLoader(const wxChar *dllName)
+ : m_dllName(dllName)
+ {
+ };
+
+
+ // return the symbol with the given name or NULL if the DLL not loaded
+ // or symbol not present
+ void *GetSymbol(const wxChar *name)
{
+ // we're prepared to handle errors here
wxLogNull noLog;
- if ( !ms_triedToLoad )
+ if ( m_dllName )
{
- ms_triedToLoad = true;
- ms_dll.Load(_T("msimg32"));
+ m_dll.Load(m_dllName);
+
+ // reset the name whether we succeeded or failed so that we don't
+ // try again the next time
+ m_dllName = NULL;
}
- return ms_dll.IsLoaded() ? ms_dll.GetSymbol(name) : NULL;
+ return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
}
private:
- static wxDynamicLibrary ms_dll;
- static bool ms_triedToLoad;
+ wxDynamicLibrary m_dll;
+ const wxChar *m_dllName;
};
-wxDynamicLibrary wxMSImg32DLL::ms_dll;
-bool wxMSImg32DLL::ms_triedToLoad = false;
-
-// helper macro for getting the symbols from msimg32.dll: it supposes that a
-// type "name_t" is defined and casts the returned symbol to it automatically
-#define wxMSIMG32_SYMBOL(name) (name ## _t)wxMSImg32DLL::GetSymbol(_T(#name))
+static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
// ===========================================================================
// implementation
// on desktop WIN32 also, since the WIN32 docs imply that the user
// clipping region is independent from the paint clipping region.
::SelectClipRgn(GetHdc(), 0);
-#else
+#else
// TODO: this should restore the previous clipping region,
// so that OnPaint processing works correctly, and the update
// clipping region doesn't get destroyed after the first
HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
::SelectClipRgn(GetHdc(), rgn);
::DeleteObject(rgn);
-#endif
+#endif
}
wxDCBase::DestroyClippingRegion();
if (!m_selectedBitmap.Ok())
return;
- rect.left = 0; rect.top = 0;
- rect.right = m_selectedBitmap.GetWidth();
- rect.bottom = m_selectedBitmap.GetHeight();
+ rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
+ rect.right = m_selectedBitmap.GetWidth()-m_deviceOriginX;
+ rect.bottom = m_selectedBitmap.GetHeight()-m_deviceOriginY;
}
#ifndef __WXWINCE__
// transparent pen) one pixel smaller in both directions and we want them
// to have the same size regardless of which pen is used - adjust
- // I wonder if this shouldnยดt be done after the LOG2DEV() conversions. RR.
+ // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
if ( m_pen.GetStyle() == wxTRANSPARENT )
{
// Apparently not needed for WinCE (see e.g. Life! demo)
// Rather than reproduce wxDC::Blit, let's do it at the wxWin API
// level
wxMemoryDC memDC;
- memDC.SelectObject(bmp);
+
+ memDC.SelectObjectAsSource(bmp);
Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
else // selected ok
{
if ( !m_oldFont )
- m_oldFont = (WXHPEN)hfont;
+ m_oldFont = (WXHFONT)hfont;
m_font = font;
}
else // selected ok
{
if ( !m_oldBrush )
- m_oldBrush = (WXHPEN)hbrush;
+ m_oldBrush = (WXHBRUSH)hbrush;
m_brush = brush;
}
wxLogLastError(_T("GetTextExtentPoint32()"));
}
+#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
// the result computed by GetTextExtentPoint32() may be too small as it
// accounts for under/overhang of the first/last character while we want
// just the bounding rect for this string so adjust the width as needed
+ // (using API not available in 2002 SDKs of WinCE)
if ( len > 0 )
{
ABC width;
}
//else: GetCharABCWidths() failed, not a TrueType font?
}
+#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
TEXTMETRIC tm;
::GetTextMetrics(GetHdc(), &tm);
{
// Win9x and WinNT+ have different limits
int version = wxGetOsVersion();
- maxLenText = version == wxWINDOWS_NT ? 65535 : 8192;
- maxWidth = version == wxWINDOWS_NT ? INT_MAX : 32767;
+ maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
+ maxWidth = version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
}
widths.Empty();
ds.dsBm.bmBits,
(LPBITMAPINFO)&ds.dsBmih,
DIB_RGB_COLORS,
- SRCCOPY
+ dwRop
) == (int)GDI_ERROR )
{
// On Win9x this API fails most (all?) of the time, so
HDC,int,int,int,int,
BLENDFUNCTION);
- static AlphaBlend_t pfnAlphaBlend = wxMSIMG32_SYMBOL(AlphaBlend);
+ static AlphaBlend_t
+ pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
if ( pfnAlphaBlend )
{
BLENDFUNCTION bf;
#if defined(GRADIENT_FILL_RECT_H) && wxUSE_DYNLIB_CLASS
typedef BOOL
(WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
- static GradientFill_t pfnGradientFill = wxMSIMG32_SYMBOL(GradientFill);
+ static GradientFill_t pfnGradientFill =
+ (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
if ( pfnGradientFill )
{
vertices[0].x = rect.GetLeft();
vertices[0].y = rect.GetTop();
- vertices[1].x = rect.GetRight();
- vertices[1].y = rect.GetBottom();
+ vertices[1].x = rect.GetRight()+1;
+ vertices[1].y = rect.GetBottom()+1;
vertices[firstVertex].Red = (COLOR16)(initialColour.Red() << 8);
vertices[firstVertex].Green = (COLOR16)(initialColour.Green() << 8);
wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
}
+
+static DWORD wxGetDCLayout(HDC hdc)
+{
+ typedef DWORD (WINAPI *GetLayout_t)(HDC);
+ static GetLayout_t
+ pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));
+
+ return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;
+}
+
+wxLayoutDirection wxDC::GetLayoutDirection() const
+{
+ DWORD layout = wxGetDCLayout(GetHdc());
+
+ if ( layout == (DWORD)-1 )
+ return wxLayout_Default;
+
+ return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
+}
+
+void wxDC::SetLayoutDirection(wxLayoutDirection dir)
+{
+ typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
+ static SetLayout_t
+ pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
+ if ( !pfnSetLayout )
+ return;
+
+ if ( dir == wxLayout_Default )
+ {
+ dir = wxTheApp->GetLayoutDirection();
+ if ( dir == wxLayout_Default )
+ return;
+ }
+
+ DWORD layout = wxGetDCLayout(GetHdc());
+ if ( dir == wxLayout_RightToLeft )
+ layout |= LAYOUT_RTL;
+ else
+ layout &= ~LAYOUT_RTL;
+
+ pfnSetLayout(GetHdc(), layout);
+}
projects / wxWidgets.git / blobdiff