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

small mods to tree ctrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-15 19:10:29 +00:00
parent a28d23bb2c
commit 5679f3353c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/minimal/minimal.cpp
View File

@@ -165,6 +165,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a status bar just for fun (by default with 1 pane only) // create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2); CreateStatusBar(2);
SetStatusText("Welcome to wxWindows!"); SetStatusText("Welcome to wxWindows!");
// SetSizeHints( size.x, size.y, size.x, size.y );
} }

7
src/generic/treectrl.cpp
View File

@@ -287,6 +287,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
if ((point.y > m_y) && (point.y < m_y + m_height)) if ((point.y > m_y) && (point.y < m_y + m_height))
{ {
// FIXME why +5? // FIXME why +5?
// Because that is the size of the plus sign, RR
if ((point.x > m_xCross-5) && (point.x < m_xCross+5) && if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
(point.y > m_yCross-5) && (point.y < m_yCross+5) && (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
(IsExpanded() || HasPlus())) (IsExpanded() || HasPlus()))
@@ -295,8 +296,10 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
return this; return this;
} }
/* TODO: we should do a query here like
m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); */
int w = m_width; int w = m_width;
if (m_image != -1) w += 20; if (m_image != -1) w += 24;
if ((point.x > m_x) && (point.x < m_x+w)) if ((point.x > m_x) && (point.x < m_x+w))
{ {
@@ -1113,7 +1116,7 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
int total_h = (image_h > text_h) ? image_h : text_h; int total_h = (image_h > text_h) ? image_h : text_h;
if(m_lineHeight > total_h) total_h = m_lineHeight; if(m_lineHeight > total_h) total_h = m_lineHeight;
dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+2, total_h ); dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+4, total_h );
if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
{ {