diff options
| author | nyamatongwe <devnull@localhost> | 2012-06-29 22:46:51 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2012-06-29 22:46:51 +1000 |
| commit | 49dbca76d7e87fb020bbebf954c15bb66f43cb1e (patch) | |
| tree | 6506c9eee8acd5c2990d107432afbe98cf763e5a | |
| parent | ed323f00f003d877b947b6dd949d3d3bc301a2e6 (diff) | |
| download | scintilla-mirror-49dbca76d7e87fb020bbebf954c15bb66f43cb1e.tar.gz | |
Fix 64-bit compilation errors on Windows.
From Fan Yang.
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 0453fc253..4c8fbe1d3 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -404,6 +404,7 @@ <td>Mark Yen</td> <td>Philippe Elsass</td> <td>Dimitar Zhekov</td> + <td>Fan Yang</td> </tr> </table> <p> diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index b6cca8166..067b0f4ab 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -469,7 +469,7 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const { char fontName[64]; int style = send(SCI_GETSTYLEAT, pos); - int len = send(SCI_STYLEGETFONT, style, (long)fontName); + int len = send(SCI_STYLEGETFONT, style, (sptr_t)fontName); int size = send(SCI_STYLEGETSIZE, style); bool italic = send(SCI_STYLEGETITALIC, style); int weight = send(SCI_STYLEGETBOLD, style) ? QFont::Bold : -1; @@ -496,7 +496,7 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const textRange.chrg = charRange; textRange.lpstrText = buffer.data(); - send(SCI_GETTEXTRANGE, 0, (long)&textRange); + send(SCI_GETTEXTRANGE, 0, (sptr_t)&textRange); return sqt->StringFromDocument(buffer.constData()); } @@ -504,7 +504,7 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const case Qt::ImCurrentSelection: { QVarLengthArray<char,1024> buffer(send(SCI_GETSELTEXT)); - send(SCI_GETSELTEXT, 0, (long)buffer.data()); + send(SCI_GETSELTEXT, 0, (sptr_t)buffer.data()); return sqt->StringFromDocument(buffer.constData()); } |