hrev54040 adds 1 changeset to branch 'master'
old head: e4225c3b0ec16c755f1edebb65c7a7f1e57bd97b
new head: ffee10ada1c597c7738fc584d6def417bc154e59
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ffee10ada1c5+%5Ee4225c3b0ec1
----------------------------------------------------------------------------
ffee10ada1c5: StyledEdit: Fix build after previous changes.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54040
Commit: ffee10ada1c597c7738fc584d6def417bc154e59
URL: https://git.haiku-os.org/haiku/commit/?id=ffee10ada1c5
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Apr 12 21:24:03 2020 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/apps/stylededit/StyledEditWindow.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/apps/stylededit/StyledEditWindow.cpp
b/src/apps/stylededit/StyledEditWindow.cpp
index 27e9ef3479..adb90de83c 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -406,7 +406,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
fTextView->GetFontAndColor(&font, &sameProperties);
//GetFont seems to return a constant size for
font.Size(),
//thus not used here (maybe that is a bug)
- int32 cur_size = font.Size();
+ int32 cur_size = (int32)font.Size();
for (unsigned int a = 0;
a < sizeof(fontSizes)/sizeof(fontSizes[0]);
a++) {
@@ -423,7 +423,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
BFont font;
fTextView->GetFontAndColor(&font, &sameProperties);
- int32 cur_size = font.Size();
+ int32 cur_size = (int32)font.Size();
for (unsigned int a = 1;
a < sizeof(fontSizes)/sizeof(fontSizes[0]);
a++) {
