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

more minor fixes, stabalizations, etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-08-08 19:19:49 +00:00
parent f29dc62250
commit 0d8ab7638d
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/include/wx/stc/stc.h
View File

@@ -237,6 +237,7 @@ public:
wxSTC_UndoType GetUndoCollection(); wxSTC_UndoType GetUndoCollection();
void BeginUndoAction(); void BeginUndoAction();
void EndUndoAction(); void EndUndoAction();
void SetSavePoint();
// Selection and information // Selection and information

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

@@ -464,6 +464,7 @@ ListBox::~ListBox() {
void ListBox::Create(Window &parent, int ctrlID) { void ListBox::Create(Window &parent, int ctrlID) {
id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize, id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
0, NULL, wxLB_SINGLE | wxLB_SORT); 0, NULL, wxLB_SINGLE | wxLB_SORT);
((wxListBox*)id)->Show(FALSE);
} }
void ListBox::Clear() { void ListBox::Clear() {

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

@@ -333,6 +333,9 @@ void wxStyledTextCtrl::EndUndoAction() {
} }
void wxStyledTextCtrl::SetSavePoint() {
SendMsg(SCI_SETSAVEPOINT);
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -356,10 +359,11 @@ wxString wxStyledTextCtrl::GetSelectedText() {
GetSelection(&start, &end); GetSelection(&start, &end);
int len = end - start; int len = end - start;
char* buff = text.GetWriteBuf(len); if (len > 0) {
char* buff = text.GetWriteBuf(len);
SendMsg(EM_GETSELTEXT, 0, (long)buff); SendMsg(EM_GETSELTEXT, 0, (long)buff);
text.UngetWriteBuf(); text.UngetWriteBuf();
}
return text; return text;
} }
@@ -1049,7 +1053,7 @@ void wxStyledTextCtrl::MarkerDeleteAll(int markerNumber) {
int wxStyledTextCtrl::MarkerGet(int line) { int wxStyledTextCtrl::MarkerGet(int line) {
return SendMsg(SCI_MARKERGET); return SendMsg(SCI_MARKERGET, line);
} }
@@ -1059,7 +1063,7 @@ int wxStyledTextCtrl::MarkerGetNextLine(int lineStart, int markerMask) {
int wxStyledTextCtrl::MarkerGetPrevLine(int lineStart, int markerMask) { int wxStyledTextCtrl::MarkerGetPrevLine(int lineStart, int markerMask) {
// return SendMsg(SCI_MARKERPREV, lineStart, markerMask); // TODO return SendMsg(SCI_MARKERPREV, lineStart, markerMask);
return 0; return 0;
} }
@@ -1140,7 +1144,7 @@ char wxStyledTextCtrl::AutoCompGetSeparator() {
void wxStyledTextCtrl::AutoCompSelect(const wxString& stringtoselect) { void wxStyledTextCtrl::AutoCompSelect(const wxString& stringtoselect) {
SendMsg(SCI_AUTOCSELECT, (long)stringtoselect.c_str()); SendMsg(SCI_AUTOCSELECT, 0, (long)stringtoselect.c_str());
} }

1
include/wx/stc/stc.h
View File

@@ -237,6 +237,7 @@ public:
wxSTC_UndoType GetUndoCollection(); wxSTC_UndoType GetUndoCollection();
void BeginUndoAction(); void BeginUndoAction();
void EndUndoAction(); void EndUndoAction();
void SetSavePoint();
// Selection and information // Selection and information

1
src/stc/PlatWX.cpp
View File

@@ -464,6 +464,7 @@ ListBox::~ListBox() {
void ListBox::Create(Window &parent, int ctrlID) { void ListBox::Create(Window &parent, int ctrlID) {
id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize, id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
0, NULL, wxLB_SINGLE | wxLB_SORT); 0, NULL, wxLB_SINGLE | wxLB_SORT);
((wxListBox*)id)->Show(FALSE);
} }
void ListBox::Clear() { void ListBox::Clear() {

18
src/stc/stc.cpp
View File

@@ -333,6 +333,9 @@ void wxStyledTextCtrl::EndUndoAction() {
} }
void wxStyledTextCtrl::SetSavePoint() {
SendMsg(SCI_SETSAVEPOINT);
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -356,10 +359,11 @@ wxString wxStyledTextCtrl::GetSelectedText() {
GetSelection(&start, &end); GetSelection(&start, &end);
int len = end - start; int len = end - start;
char* buff = text.GetWriteBuf(len); if (len > 0) {
char* buff = text.GetWriteBuf(len);
SendMsg(EM_GETSELTEXT, 0, (long)buff); SendMsg(EM_GETSELTEXT, 0, (long)buff);
text.UngetWriteBuf(); text.UngetWriteBuf();
}
return text; return text;
} }
@@ -1049,7 +1053,7 @@ void wxStyledTextCtrl::MarkerDeleteAll(int markerNumber) {
int wxStyledTextCtrl::MarkerGet(int line) { int wxStyledTextCtrl::MarkerGet(int line) {
return SendMsg(SCI_MARKERGET); return SendMsg(SCI_MARKERGET, line);
} }
@@ -1059,7 +1063,7 @@ int wxStyledTextCtrl::MarkerGetNextLine(int lineStart, int markerMask) {
int wxStyledTextCtrl::MarkerGetPrevLine(int lineStart, int markerMask) { int wxStyledTextCtrl::MarkerGetPrevLine(int lineStart, int markerMask) {
// return SendMsg(SCI_MARKERPREV, lineStart, markerMask); // TODO return SendMsg(SCI_MARKERPREV, lineStart, markerMask);
return 0; return 0;
} }
@@ -1140,7 +1144,7 @@ char wxStyledTextCtrl::AutoCompGetSeparator() {
void wxStyledTextCtrl::AutoCompSelect(const wxString& stringtoselect) { void wxStyledTextCtrl::AutoCompSelect(const wxString& stringtoselect) {
SendMsg(SCI_AUTOCSELECT, (long)stringtoselect.c_str()); SendMsg(SCI_AUTOCSELECT, 0, (long)stringtoselect.c_str());
} }