Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow wxTextMeasure to work with non-native wxDC objects too.

Browse Source 
Just forward back to wxDC itself in this case instead of using the
platform-specific code in wxTextMeasure that only works with native DCs.

See #14781.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-27 12:27:56 +00:00
parent 5fd78a8e6f
commit 1bce253a23
5 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/textmeasure.cpp
View File

@@ -24,7 +24,6 @@
#endif
#include "wx/msw/private.h"
#include "wx/msw/dc.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
@@ -33,6 +32,8 @@
#include "wx/private/textmeasure.h"
#include "wx/msw/dc.h"
// ============================================================================
// wxTextMeasure implementation
// ============================================================================
@@ -41,6 +42,16 @@ void wxTextMeasure::Init()
{
m_hdc = NULL;
m_hfontOld = NULL;
if ( m_dc )
{
wxClassInfo* const ci = m_dc->GetImpl()->GetClassInfo();
if ( ci->IsKindOf(wxCLASSINFO(wxMSWDCImpl)))
{
m_useDCImpl = false;
}
}
}
void wxTextMeasure::BeginMeasuring()