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

1. wxShell fixes: now really uses shell (it wasn't different from wxExecute!)

Browse Source 
and also added a version which captures the programs output
2. fix for compilers which have void ftime() (my mingw does) in timercmn.cpp
3. updated console sample to test wxShell/wxExecute
4. treetest now can toggle images or change their size
5. wxTreeCtrl doesn't crash if it has no image list


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-03 10:31:34 +00:00
parent 914589c26c
commit 2c8e47380e
13 changed files with 380 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/generic/treectrl.cpp
View File

@@ -1496,10 +1496,12 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
{
m_imageListNormal = imageList;
if ( !m_imageListNormal )
return;
// Calculate a m_lineHeight value from the image sizes.
// May be toggle off. Then wxTreeCtrl will spread when
// necessary (which might look ugly).
#if 1
wxClientDC dc(this);
m_lineHeight = (int)(dc.GetCharHeight() + 4);
int width = 0, height = 0,
@@ -1515,7 +1517,6 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
m_lineHeight += 2; // at least 2 pixels
else
m_lineHeight += m_lineHeight/10; // otherwise 10% extra spacing
#endif
}
void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
@@ -1571,8 +1572,15 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
int image = item->GetCurrentImage();
if ( image != NO_IMAGE )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
if ( m_imageListNormal )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
else
{
image = NO_IMAGE;
}
}
int total_h = GetLineHeight(item);
@@ -2062,8 +2070,15 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item )
int image = m_currentEdit->GetCurrentImage();
if ( image != NO_IMAGE )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
if ( m_imageListNormal )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
else
{
wxFAIL_MSG(_T("you must create an image list to use images!"));
}
}
x += image_w;
w -= image_w + 4; // I don't know why +4 is needed
@@ -2304,8 +2319,11 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
int image = item->GetCurrentImage();
if ( image != NO_IMAGE )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
if ( m_imageListNormal )
{
m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
}
int total_h = (image_h > text_h) ? image_h : text_h;