haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gcc (or linux?) happy.

This commit is contained in:
Jeff Young 2022-02-26 22:56:10 +00:00
parent ae85f57577
commit 98f4b1d16c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/font/font.cpp
View File

@ -214,7 +214,7 @@ VECTOR2I drawMarkup( BOX2I* aBoundingBox, std::vector<std::unique_ptr<GLYPH>>* a
{ {
BOX2I bbox; BOX2I bbox;
nextPosition = aFont->GetTextAsGlyphs( &bbox, aGlyphs, aNode->wxString(), aSize, nextPosition = aFont->GetTextAsGlyphs( &bbox, aGlyphs, aNode->asWxString(), aSize,
aPosition, aAngle, aMirror, aOrigin, aPosition, aAngle, aMirror, aOrigin,
textStyle ); textStyle );
@ -354,10 +354,10 @@ void wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords,
if( aNode->has_content() ) if( aNode->has_content() )
{ {
VECTOR2I next = aFont->GetTextAsGlyphs( nullptr, nullptr, aNode->wxString(), VECTOR2I next = aFont->GetTextAsGlyphs( nullptr, nullptr, aNode->asWxString(),
aSize, { 0, 0 }, ANGLE_0, false, { 0, 0 }, aSize, { 0, 0 }, ANGLE_0, false, { 0, 0 },
textStyle ); textStyle );
word += aNode->wxString(); word += aNode->asWxString();
width += next.x; width += next.x;
} }
@ -379,7 +379,7 @@ void wordbreakMarkup( std::vector<std::pair<wxString, int>>* aWords,
else else
{ {
wxString space( wxS( " " ) ); wxString space( wxS( " " ) );
wxString textRun = aNode->wxString(); wxString textRun = aNode->asWxString();
wxArrayString words; wxArrayString words;
wxStringSplit( textRun, words, ' ' ); wxStringSplit( textRun, words, ' ' );

2
common/markup_parser.cpp
View File

@ -57,7 +57,7 @@ std::string NODE::typeString() const
} }
wxString NODE::wxString() const wxString NODE::asWxString() const
{ {
return FROM_UTF8( string().c_str() ); return FROM_UTF8( string().c_str() );
} }

2
include/markup_parser.h
View File

@ -42,7 +42,7 @@ struct NODE : parse_tree::basic_node<NODE>
std::string typeString() const; std::string typeString() const;
wxString wxString() const; wxString asWxString() const;
bool isOverbar() const { return is_type<MARKUP::overbar>(); } bool isOverbar() const { return is_type<MARKUP::overbar>(); }
bool isSubscript() const { return is_type<MARKUP::subscript>(); } bool isSubscript() const { return is_type<MARKUP::subscript>(); }