Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some inline helpers so the dependence on wxUSE_UNICODE and

Browse Source 
wxUSE_WCHAR_T can be localized instead of having #if's all over the
place.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-05-13 23:31:02 +00:00
parent 267484bc4f
commit 0c5b83b0fa
14 changed files with 246 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/src/stc/ScintillaWX.cpp
View File

@@ -172,7 +172,7 @@ void ScintillaWX::Finalise() {
void ScintillaWX::StartDrag() {
#if wxUSE_DRAG_AND_DROP
wxString dragText(drag.s, wxConvUTF8, drag.len);
wxString dragText = stc2wx(drag.s, drag.len);
// Send an event to allow the drag text to be changed
wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
@@ -320,7 +320,7 @@ void ScintillaWX::Copy() {
SelectionText st;
CopySelectionRange(&st);
wxTheClipboard->Open();
wxString text(st.s, wxConvUTF8, st.len);
wxString text = stc2wx(st.s, st.len);
wxTheClipboard->SetData(new wxTextDataObject(text));
wxTheClipboard->Close();
}
@@ -338,7 +338,7 @@ void ScintillaWX::Paste() {
gotData = wxTheClipboard->GetData(data);
wxTheClipboard->Close();
if (gotData) {
wxWX2MBbuf buf = (wxWX2MBbuf)data.GetText().mb_str(wxConvUTF8);
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
int len = strlen(buf);
pdoc->InsertString(currentPos, buf, len);
SetEmptySelection(currentPos + len);
@@ -370,7 +370,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
if (!label[0])
((wxMenu*)popup.GetID())->AppendSeparator();
else
((wxMenu*)popup.GetID())->Append(cmd, wxString(label, *wxConvCurrent));
((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label));
if (!enabled)
((wxMenu*)popup.GetID())->Enable(cmd, enabled);
@@ -601,7 +601,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
dragResult = evt.GetDragResult();
if (dragResult == wxDragMove || dragResult == wxDragCopy) {
DropAt(evt.GetPosition(),
evt.GetDragText().mb_str(wxConvUTF8),
wx2stc(evt.GetDragText()),
dragResult == wxDragMove,
FALSE); // TODO: rectangular?
return TRUE;