mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-24 22:40:48 +00:00
refactor: unglob std::wstring
This commit is contained in:
@@ -36,8 +36,8 @@ public:
|
||||
|
||||
DWORD m_dwNestedBeginCount;
|
||||
|
||||
wstring m_fontName;
|
||||
wstring m_fallbackFont;
|
||||
std::wstring m_fontName;
|
||||
std::wstring m_fallbackFont;
|
||||
DWORD refCount;
|
||||
public:
|
||||
float getScaleFactor() { return m_fScaleFactor; }
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
// m_fXScaleFactor = m_fYScaleFactor = m_fScaleFactor;
|
||||
}
|
||||
|
||||
void SetFallbackFont(const wstring &fallbackFont) { m_fallbackFont = fallbackFont; }
|
||||
void SetFallbackFont(const std::wstring &fallbackFont) { m_fallbackFont = fallbackFont; }
|
||||
void IncRefCount() { ++refCount; }
|
||||
void DecRefCount() { --refCount; }
|
||||
|
||||
|
||||
@@ -239,7 +239,7 @@ HRESULT XUI_FontRenderer::DrawCharsToDevice( HFONTOBJ hFont, CharData * pCharDat
|
||||
#if 1
|
||||
for( int i = 0; i < dwCount; i++ )
|
||||
{
|
||||
wstring string;
|
||||
std::wstring string;
|
||||
string.push_back(pCharData[i].wch);
|
||||
lineYPos = pCharData[i].y;
|
||||
lineXPos = pCharData[i].x;
|
||||
@@ -257,7 +257,7 @@ HRESULT XUI_FontRenderer::DrawCharsToDevice( HFONTOBJ hFont, CharData * pCharDat
|
||||
DWORD i = 0;
|
||||
while( i < dwCount )
|
||||
{
|
||||
wstring string;
|
||||
std::wstring string;
|
||||
lineYPos = pCharData[i].y;
|
||||
lineXPos = pCharData[i].x;
|
||||
colour = pCharData[i].dwColor;
|
||||
|
||||
Reference in New Issue
Block a user