github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

fix without patch

Browse source 
Приведение в соответствие с github
Патч делать не нужно.
This commit is contained in:
lsv 2022-04-27 16:01:13 +05:00
parent bdfca63db0
commit 9e9bfef8b8
56 changed files with 512 additions and 505 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ctl/ctlSQLBox.cpp
View file

@ -1019,7 +1019,12 @@ long ctlSQLBox::SelectQuery(int startposition)
pend=pos;
break;
}
#ifdef WIN32
int i=IsDBCSLeadByte(ch)? 2 : 1;
#else
int i=1;
if (ch>255) i=2;
#endif
pos=pos+i;
}
@ -1036,7 +1041,12 @@ long ctlSQLBox::SelectQuery(int startposition)
break;
}
if (ch>' ') pstart=pos;
#ifdef WIN32
int i=IsDBCSLeadByte(ch)? 2 : 1;
#else
int i=1;
if (ch>255) i=2;
#endif
pos=pos-i;
}
@ -1135,7 +1145,7 @@ void ctlSQLBox::OnPositionStc(wxStyledTextEvent &event)
}
}
}
// получение позици select
// position select
pos=tmp;
wxString keyword;
wxString ident;
@ -1542,7 +1552,7 @@ CharacterRange ctlSQLBox::RegexFindText(int minPos, int maxPos, const wxString &
wxWX2MBbuf buf = text.mb_str(wxConvUTF8);
ft.lpstrText = (char *)(const char *)buf;
//не компилировалась с wx 2.8.12
//<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> wx 2.8.12
if (SendMsg(2150, wxSTC_FIND_REGEXP, (long)&ft) == -1)
{
ft.chrgText.cpMin = -1;