i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

64-bit fixes for StyledEdit.

Browse Source
This commit is contained in:
Rene Gollent
2012-08-28 10:11:53 +01:00
committed by Alex Smith
parent c3fa08a6c9
commit cdf25540df
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/stylededit/StyledEditWindow.cpp
+6 -6
View File
@@ -1118,7 +1118,7 @@ StyledEditWindow::_InitWindow(uint32 encoding)
fontMessage->AddFloat("size", fontSizes[i]); fontMessage->AddFloat("size", fontSizes[i]);
char label[64]; char label[64];
snprintf(label, sizeof(label), "%ld", fontSizes[i]); snprintf(label, sizeof(label), "%" B_PRId32, fontSizes[i]);
fFontSizeMenu->AddItem(menuItem = new BMenuItem(label, fontMessage)); fFontSizeMenu->AddItem(menuItem = new BMenuItem(label, fontMessage));
if (fontSizes[i] == (int32)be_plain_font->Size()) if (fontSizes[i] == (int32)be_plain_font->Size())
@@ -1451,7 +1451,7 @@ StyledEditWindow::_Search(BString string, bool caseSensitive, bool wrap,
if (start != B_ERROR) { if (start != B_ERROR) {
finish = start + length; finish = start + length;
fTextView->Select(start, finish); fTextView->Select(start, finish);
if (scrollToOccurence) if (scrollToOccurence)
fTextView->ScrollToSelection(); fTextView->ScrollToSelection();
return true; return true;
@@ -1505,7 +1505,7 @@ StyledEditWindow::_ReplaceAll(BString findThis, BString replaceWith,
{ {
bool first = true; bool first = true;
fTextView->SetSuppressChanges(true); fTextView->SetSuppressChanges(true);
// start from the beginning of text // start from the beginning of text
fTextView->Select(0, 0); fTextView->Select(0, 0);
@@ -1517,11 +1517,11 @@ StyledEditWindow::_ReplaceAll(BString findThis, BString replaceWith,
} }
int32 start; int32 start;
int32 finish; int32 finish;
fTextView->GetSelection(&start, &finish); fTextView->GetSelection(&start, &finish);
fTextView->Delete(start, start + findThis.Length()); fTextView->Delete(start, start + findThis.Length());
fTextView->Insert(start, replaceWith.String(), replaceWith.Length()); fTextView->Insert(start, replaceWith.String(), replaceWith.Length());
// advance the caret behind the inserted text // advance the caret behind the inserted text
start += replaceWith.Length(); start += replaceWith.Length();
fTextView->Select(start, start); fTextView->Select(start, start);
@@ -1641,7 +1641,7 @@ StyledEditWindow::_ShowStatistics()
BAlert* alert = new BAlert("Statistics", result, B_TRANSLATE("OK"), NULL, BAlert* alert = new BAlert("Statistics", result, B_TRANSLATE("OK"), NULL,
NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_INFO_ALERT); NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_INFO_ALERT);
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
return alert->Go(); return alert->Go();
} }