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

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-24 00:26:01 +00:00
parent c193b707eb
commit f98e25588d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/treectrl.cpp
View File

@@ -28,7 +28,7 @@
#pragma hdrstop
#endif
#include "wx/generic/treectrl.h"
#include "wx/treectrl.h"
#include "wx/generic/imaglist.h"
#include "wx/settings.h"
#include "wx/log.h"
@@ -162,8 +162,6 @@ private:
// wxTreeEvent
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
: wxNotifyEvent( commandType, id )
{
@@ -1036,7 +1034,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
event.SetEventObject( this );
// TODO : Here we don't send any selection mode yet !
if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
return;
// ctrl press
@@ -1278,7 +1276,7 @@ void wxTreeCtrl::AdjustMyScrollbars()
int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
{
if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HIGHT)
if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
return item->GetHeight();
else
return m_lineHeight;