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

Fix the off-by-one a little differently, and correct a refresh problem

Browse Source 
on wxMac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-02-14 02:22:03 +00:00
parent 0fcf2b15da
commit d13ea3aa4f
2 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,14 +28,14 @@ Point Point::FromLong(long lpoint) {
} }
wxRect wxRectFromPRectangle(PRectangle prc) { wxRect wxRectFromPRectangle(PRectangle prc) {
wxRect rc(prc.left, prc.top, wxRect r(prc.left, prc.top,
prc.right-prc.left, prc.bottom-prc.top); prc.Width(), prc.Height());
return rc; return r;
} }
PRectangle PRectangleFromwxRect(wxRect rc) { PRectangle PRectangleFromwxRect(wxRect rc) {
return PRectangle(rc.GetLeft(), rc.GetTop(), return PRectangle(rc.GetLeft(), rc.GetTop(),
rc.GetRight()+1, rc.GetBottom()+1); rc.GetRight(), rc.GetBottom());
} }
wxColour wxColourFromCA(const ColourAllocated& ca) { wxColour wxColourFromCA(const ColourAllocated& ca) {
@@ -411,7 +411,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
} }
void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
@@ -424,7 +424,7 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
hdc->SetClippingRegion(wxRectFromPRectangle(rc)); hdc->SetClippingRegion(wxRectFromPRectangle(rc));
// see comments above // see comments above
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
hdc->DestroyClippingRegion(); hdc->DestroyClippingRegion();
} }
@@ -439,7 +439,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
hdc->SetBackgroundMode(wxSOLID); hdc->SetBackgroundMode(wxSOLID);
} }
@@ -531,7 +531,7 @@ int SurfaceImpl::ExternalLeading(Font &font) {
int SurfaceImpl::Height(Font &font) { int SurfaceImpl::Height(Font &font) {
SetFont(font); SetFont(font);
return hdc->GetCharHeight(); return hdc->GetCharHeight() + 1;
} }
int SurfaceImpl::AverageCharWidth(Font &font) { int SurfaceImpl::AverageCharWidth(Font &font) {
@@ -713,10 +713,9 @@ private:
void* doubleClickActionData; void* doubleClickActionData;
public: public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER ) wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxSIMPLE_BORDER )
{ {
SetBackgroundColour(*wxBLACK);
lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize, lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER); wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
lv->SetCursor(wxCursor(wxCURSOR_ARROW)); lv->SetCursor(wxCursor(wxCURSOR_ARROW));
@@ -736,6 +735,14 @@ public:
// close it, so do a pending delete of it instead of destroying // close it, so do a pending delete of it instead of destroying
// immediately. // immediately.
bool Destroy() { bool Destroy() {
#ifdef __WXMAC__
// There bottom edge of this window is not getting properly
// refreshed upon deletion, so help it out...
wxWindow* p = GetParent();
wxRect r(GetPosition(), GetSize());
r.SetHeight(r.GetHeight()+1);
p->Refresh(false, &r);
#endif
if ( !wxPendingDelete.Member(this) ) if ( !wxPendingDelete.Member(this) )
wxPendingDelete.Append(this); wxPendingDelete.Append(this);
return TRUE; return TRUE;
@@ -765,9 +772,9 @@ public:
} }
void OnSize(wxSizeEvent& event) { void OnSize(wxSizeEvent& event) {
// resize the child, leaving a 1 pixel border // resize the child
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
lv->SetSize(1, 1, sz.x-2, sz.y-2); lv->SetSize(sz);
// reset the column widths // reset the column widths
lv->SetColumnWidth(0, IconWidth()+4); lv->SetColumnWidth(0, IconWidth()+4);
lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) - lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -

31
src/stc/PlatWX.cpp
View File

@@ -28,14 +28,14 @@ Point Point::FromLong(long lpoint) {
} }
wxRect wxRectFromPRectangle(PRectangle prc) { wxRect wxRectFromPRectangle(PRectangle prc) {
wxRect rc(prc.left, prc.top, wxRect r(prc.left, prc.top,
prc.right-prc.left, prc.bottom-prc.top); prc.Width(), prc.Height());
return rc; return r;
} }
PRectangle PRectangleFromwxRect(wxRect rc) { PRectangle PRectangleFromwxRect(wxRect rc) {
return PRectangle(rc.GetLeft(), rc.GetTop(), return PRectangle(rc.GetLeft(), rc.GetTop(),
rc.GetRight()+1, rc.GetBottom()+1); rc.GetRight(), rc.GetBottom());
} }
wxColour wxColourFromCA(const ColourAllocated& ca) { wxColour wxColourFromCA(const ColourAllocated& ca) {
@@ -411,7 +411,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
} }
void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
@@ -424,7 +424,7 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
hdc->SetClippingRegion(wxRectFromPRectangle(rc)); hdc->SetClippingRegion(wxRectFromPRectangle(rc));
// see comments above // see comments above
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
hdc->DestroyClippingRegion(); hdc->DestroyClippingRegion();
} }
@@ -439,7 +439,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
// ybase is where the baseline should be, but wxWin uses the upper left // ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text... // corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent - 1); hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
hdc->SetBackgroundMode(wxSOLID); hdc->SetBackgroundMode(wxSOLID);
} }
@@ -531,7 +531,7 @@ int SurfaceImpl::ExternalLeading(Font &font) {
int SurfaceImpl::Height(Font &font) { int SurfaceImpl::Height(Font &font) {
SetFont(font); SetFont(font);
return hdc->GetCharHeight(); return hdc->GetCharHeight() + 1;
} }
int SurfaceImpl::AverageCharWidth(Font &font) { int SurfaceImpl::AverageCharWidth(Font &font) {
@@ -713,10 +713,9 @@ private:
void* doubleClickActionData; void* doubleClickActionData;
public: public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER ) wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxSIMPLE_BORDER )
{ {
SetBackgroundColour(*wxBLACK);
lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize, lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER); wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
lv->SetCursor(wxCursor(wxCURSOR_ARROW)); lv->SetCursor(wxCursor(wxCURSOR_ARROW));
@@ -736,6 +735,14 @@ public:
// close it, so do a pending delete of it instead of destroying // close it, so do a pending delete of it instead of destroying
// immediately. // immediately.
bool Destroy() { bool Destroy() {
#ifdef __WXMAC__
// There bottom edge of this window is not getting properly
// refreshed upon deletion, so help it out...
wxWindow* p = GetParent();
wxRect r(GetPosition(), GetSize());
r.SetHeight(r.GetHeight()+1);
p->Refresh(false, &r);
#endif
if ( !wxPendingDelete.Member(this) ) if ( !wxPendingDelete.Member(this) )
wxPendingDelete.Append(this); wxPendingDelete.Append(this);
return TRUE; return TRUE;
@@ -765,9 +772,9 @@ public:
} }
void OnSize(wxSizeEvent& event) { void OnSize(wxSizeEvent& event) {
// resize the child, leaving a 1 pixel border // resize the child
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
lv->SetSize(1, 1, sz.x-2, sz.y-2); lv->SetSize(sz);
// reset the column widths // reset the column widths
lv->SetColumnWidth(0, IconWidth()+4); lv->SetColumnWidth(0, IconWidth()+4);
lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) - lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -