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

Use wxSwap() function to swap values of variables

Browse Source
This commit is contained in:
Artur Wieczorek
2017-03-15 21:02:23 +01:00
parent 0cc5b6e97e
commit 3ec5e06dff
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/stc/gen_iface.py
View File

@@ -150,9 +150,7 @@ methodOverrideMap = {
'''wxMemoryBuffer %s(int startPos, int endPos) { '''wxMemoryBuffer %s(int startPos, int endPos) {
wxMemoryBuffer buf; wxMemoryBuffer buf;
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) return buf; if (!len) return buf;
@@ -615,9 +613,7 @@ methodOverrideMap = {
Sci_RangeToFormat fr; Sci_RangeToFormat fr;
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
fr.hdc = draw; fr.hdc = draw;
fr.hdcTarget = target; fr.hdcTarget = target;
@@ -676,9 +672,7 @@ methodOverrideMap = {
'''wxString %s(int startPos, int endPos) { '''wxString %s(int startPos, int endPos) {
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) return wxEmptyString; if (!len) return wxEmptyString;

16
src/stc/stc.cpp
View File

@@ -369,9 +369,7 @@ void wxStyledTextCtrl::SetSavePoint()
wxMemoryBuffer wxStyledTextCtrl::GetStyledText(int startPos, int endPos) { wxMemoryBuffer wxStyledTextCtrl::GetStyledText(int startPos, int endPos) {
wxMemoryBuffer buf; wxMemoryBuffer buf;
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) return buf; if (!len) return buf;
@@ -1728,9 +1726,7 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos, const wxString& text,
Sci_RangeToFormat fr; Sci_RangeToFormat fr;
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
fr.hdc = draw; fr.hdc = draw;
fr.hdcTarget = target; fr.hdcTarget = target;
@@ -1819,9 +1815,7 @@ wxString wxStyledTextCtrl::GetSelectedText() {
// Retrieve a range of text. // Retrieve a range of text.
wxString wxStyledTextCtrl::GetTextRange(int startPos, int endPos) { wxString wxStyledTextCtrl::GetTextRange(int startPos, int endPos) {
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
@@ -5159,9 +5153,7 @@ wxCharBuffer wxStyledTextCtrl::GetTargetTextRaw()
wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos) wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
{ {
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) { if (!len) {

4
src/stc/stc.cpp.in
View File

@@ -624,9 +624,7 @@ wxCharBuffer wxStyledTextCtrl::GetTargetTextRaw()
wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos) wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
{ {
if (endPos < startPos) { if (endPos < startPos) {
int temp = startPos; wxSwap(startPos, endPos);
startPos = endPos;
endPos = temp;
} }
int len = endPos - startPos; int len = endPos - startPos;
if (!len) { if (!len) {