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

wx-config knows about compiler options

Browse Source 
several tree ctrl bugs removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-10 15:42:18 +00:00
parent 79372d196f
commit 4bb19cfb3a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/treectrl.cpp
View File

@@ -698,7 +698,7 @@ void wxTreeCtrl::Delete(const wxTreeItemId& itemId)
delete item; delete item;
Refresh(); m_dirty = TRUE;
} }
void wxTreeCtrl::DeleteAllItems() void wxTreeCtrl::DeleteAllItems()
@@ -708,7 +708,7 @@ void wxTreeCtrl::DeleteAllItems()
delete m_anchor; delete m_anchor;
m_anchor = NULL; m_anchor = NULL;
Refresh(); m_dirty = TRUE;
} }
} }
@@ -716,6 +716,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
{ {
wxGenericTreeItem *item = itemId.m_pItem; wxGenericTreeItem *item = itemId.m_pItem;
if ( !item->HasPlus() )
return;
if ( item->IsExpanded() ) if ( item->IsExpanded() )
return; return;
@@ -1017,6 +1020,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
{ {
dc.DrawLine( horizX+20, y, horizX+30, y ); dc.DrawLine( horizX+20, y, horizX+30, y );
dc.SetPen( *wxGREY_PEN ); dc.SetPen( *wxGREY_PEN );
dc.SetBrush( *wxWHITE_BRUSH );
dc.DrawRectangle( horizX+10, y-4, 11, 9 ); dc.DrawRectangle( horizX+10, y-4, 11, 9 );
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
dc.DrawLine( horizX+13, y, horizX+18, y ); dc.DrawLine( horizX+13, y, horizX+18, y );
@@ -1118,7 +1122,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
{ {
case '+': case '+':
case WXK_ADD: case WXK_ADD:
if (HasChildren(m_current) && !IsExpanded(m_current)) if (m_current->HasPlus() && !IsExpanded(m_current))
{ {
Expand(m_current); Expand(m_current);
} }

3
wx-config.in
View File

@@ -43,7 +43,8 @@ while test $# -gt 0; do
includes=-I@includedir@ includes=-I@includedir@
fi fi
includes="$includes -I@libdir@/wx/include" includes="$includes -I@libdir@/wx/include"
echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ @OPTIMISE@ @PROFILE@ @WXDEBUG@ @WXDEBUG_DEFINE@
;; ;;
--libs) --libs)
echo -L@libdir@ -lwx_gtk_1_0 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@ echo -L@libdir@ -lwx_gtk_1_0 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@