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

Patch #809286 and a couple other minor changes to the stc sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-19 18:40:13 +00:00
parent 854e7dc332
commit 1e545382ca
28 changed files with 232 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/src/stc/PlatWX.cpp
View File

@@ -675,6 +675,7 @@ void Window::SetCursor(Cursor curs) {
break;
case cursorHand:
cursorId = wxCURSOR_HAND;
break;
default:
cursorId = wxCURSOR_ARROW;
break;
@@ -888,7 +889,7 @@ PRectangle ListBoxImpl::GetDesiredRect() {
// wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
// the max size in Append and calculate it here...
int maxw = maxStrWidth;
int maxh = 0;
int maxh ;
// give it a default if there are no lines, and/or add a bit more
if (maxw == 0) maxw = 100;

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

@@ -409,7 +409,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
if (!label[0])
((wxMenu*)popup.GetID())->AppendSeparator();
else
((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label));
((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label)));
if (!enabled)
((wxMenu*)popup.GetID())->Enable(cmd, enabled);

2
contrib/src/stc/stc.cpp
View File

@@ -2142,7 +2142,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if #wxUSE_UNICODE
#if wxUSE_UNICODE
contents = wxString(buffer, *wxConvCurrent);
#else
contents = buffer;

2
contrib/src/stc/stc.cpp.in
View File

@@ -347,7 +347,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if #wxUSE_UNICODE
#if wxUSE_UNICODE
contents = wxString(buffer, *wxConvCurrent);
#else
contents = buffer;