Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -714,7 +714,7 @@ public:
|
||||
|
||||
switch (ce.pe->type) {
|
||||
case SPET_TEXT:
|
||||
y_offset = DrawStringMultiLine(ce.bounds.left, ce.bounds.right, ce.bounds.top - scrollpos, ce.bounds.bottom - scrollpos,
|
||||
DrawStringMultiLineWithClipping(ce.bounds.left, ce.bounds.right, ce.bounds.top - scrollpos, ce.bounds.bottom - scrollpos,
|
||||
ce.pe->text.GetDecodedString(), TC_BLACK, SA_TOP | SA_LEFT);
|
||||
break;
|
||||
|
||||
@@ -834,7 +834,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void OnDropdownSelect(WidgetID widget, int index) override
|
||||
void OnDropdownSelect(WidgetID widget, int index, int) override
|
||||
{
|
||||
if (widget != WID_SB_SEL_PAGE) return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user