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

Fixed some off-by-one errors that were visible on wxGTK but actually

Browse Source 
affected wxMSW too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-09-05 18:10:31 +00:00
parent 501662d307
commit 21156596eb
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ Point Point::FromLong(long lpoint) {
wxRect wxRectFromPRectangle(PRectangle prc) { wxRect wxRectFromPRectangle(PRectangle prc) {
wxRect rc(prc.left, prc.top, wxRect rc(prc.left, prc.top,
prc.right-prc.left+1, prc.bottom-prc.top+1); prc.right-prc.left, prc.bottom-prc.top);
return rc; return rc;
} }
@@ -169,7 +169,7 @@ void Surface::InitPixMap(int width, int height, Surface *surface_) {
Release(); Release();
hdc = new wxMemoryDC(surface_->hdc); hdc = new wxMemoryDC(surface_->hdc);
hdcOwned = true; hdcOwned = true;
bitmap = new wxBitmap(width, height+1); bitmap = new wxBitmap(width, height);
((wxMemoryDC*)hdc)->SelectObject(*bitmap); ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
// **** ::SetTextAlign(hdc, TA_BASELINE); // **** ::SetTextAlign(hdc, TA_BASELINE);
} }
@@ -183,12 +183,7 @@ void Surface::BrushColor(Colour back) {
} }
void Surface::SetFont(Font &font_) { void Surface::SetFont(Font &font_) {
if (font_.GetID()) {
// I think the following check is valid.
// It eliminates a crash for me. -- eric@sourcegear.com
if (font_.GetID())
{
hdc->SetFont(*font_.GetID()); hdc->SetFont(*font_.GetID());
} }
} }
@@ -361,9 +356,6 @@ void Surface::SetClip(PRectangle rc) {
} }
void Surface::FlushCachedState() { void Surface::FlushCachedState() {
// TODO Is there anything we need to do here? eric@sourcegear.com
// TODO I had to add this method when I merged new Scintilla code
// TODO from Neil.
} }
Window::~Window() { Window::~Window() {
@@ -395,7 +387,7 @@ void Window::SetPositionRelative(PRectangle rc, Window) {
PRectangle Window::GetClientPosition() { PRectangle Window::GetClientPosition() {
wxSize sz = id->GetClientSize(); wxSize sz = id->GetClientSize();
return PRectangle(0, 0, sz.x - 1, sz.y - 1); return PRectangle(0, 0, sz.x, sz.y);
} }
void Window::Show(bool show) { void Window::Show(bool show) {
@@ -487,10 +479,12 @@ int ListBox::GetSelection() {
} }
int ListBox::Find(const char *prefix) { int ListBox::Find(const char *prefix) {
for (int x=0; x < ((wxListBox*)id)->Number(); x++) { if (prefix) {
wxString text = ((wxListBox*)id)->GetString(x); for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
if (text.StartsWith(prefix)) wxString text = ((wxListBox*)id)->GetString(x);
return x; if (text.StartsWith(prefix))
return x;
}
} }
return -1; return -1;
} }

26
src/stc/PlatWX.cpp
View File

@@ -15,7 +15,7 @@ Point Point::FromLong(long lpoint) {
wxRect wxRectFromPRectangle(PRectangle prc) { wxRect wxRectFromPRectangle(PRectangle prc) {
wxRect rc(prc.left, prc.top, wxRect rc(prc.left, prc.top,
prc.right-prc.left+1, prc.bottom-prc.top+1); prc.right-prc.left, prc.bottom-prc.top);
return rc; return rc;
} }
@@ -169,7 +169,7 @@ void Surface::InitPixMap(int width, int height, Surface *surface_) {
Release(); Release();
hdc = new wxMemoryDC(surface_->hdc); hdc = new wxMemoryDC(surface_->hdc);
hdcOwned = true; hdcOwned = true;
bitmap = new wxBitmap(width, height+1); bitmap = new wxBitmap(width, height);
((wxMemoryDC*)hdc)->SelectObject(*bitmap); ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
// **** ::SetTextAlign(hdc, TA_BASELINE); // **** ::SetTextAlign(hdc, TA_BASELINE);
} }
@@ -183,12 +183,7 @@ void Surface::BrushColor(Colour back) {
} }
void Surface::SetFont(Font &font_) { void Surface::SetFont(Font &font_) {
if (font_.GetID()) {
// I think the following check is valid.
// It eliminates a crash for me. -- eric@sourcegear.com
if (font_.GetID())
{
hdc->SetFont(*font_.GetID()); hdc->SetFont(*font_.GetID());
} }
} }
@@ -361,9 +356,6 @@ void Surface::SetClip(PRectangle rc) {
} }
void Surface::FlushCachedState() { void Surface::FlushCachedState() {
// TODO Is there anything we need to do here? eric@sourcegear.com
// TODO I had to add this method when I merged new Scintilla code
// TODO from Neil.
} }
Window::~Window() { Window::~Window() {
@@ -395,7 +387,7 @@ void Window::SetPositionRelative(PRectangle rc, Window) {
PRectangle Window::GetClientPosition() { PRectangle Window::GetClientPosition() {
wxSize sz = id->GetClientSize(); wxSize sz = id->GetClientSize();
return PRectangle(0, 0, sz.x - 1, sz.y - 1); return PRectangle(0, 0, sz.x, sz.y);
} }
void Window::Show(bool show) { void Window::Show(bool show) {
@@ -487,10 +479,12 @@ int ListBox::GetSelection() {
} }
int ListBox::Find(const char *prefix) { int ListBox::Find(const char *prefix) {
for (int x=0; x < ((wxListBox*)id)->Number(); x++) { if (prefix) {
wxString text = ((wxListBox*)id)->GetString(x); for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
if (text.StartsWith(prefix)) wxString text = ((wxListBox*)id)->GetString(x);
return x; if (text.StartsWith(prefix))
return x;
}
} }
return -1; return -1;
} }