WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int NO_IMAGE = -1;
+
// -----------------------------------------------------------------------------
// private classes
// -----------------------------------------------------------------------------
wxArrayGenericTreeItems& GetChildren() { return m_children; }
const wxString& GetText() const { return m_text; }
- int GetImage() const { return m_image; }
- int GetSelectedImage() const { return m_selImage; }
+ int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
+ { return m_images[which]; }
wxTreeItemData *GetData() const { return m_data; }
+ // returns the current image for the item (depending on its
+ // selected/expanded/whatever state)
+ int GetCurrentImage() const;
+
void SetText( const wxString &text );
- void SetImage(int image) { m_image = image; }
- void SetSelectedImage(int image) { m_selImage = image; }
+ void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
void SetData(wxTreeItemData *data) { m_data = data; }
void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
// status inquiries
bool HasChildren() const { return !m_children.IsEmpty(); }
- bool HasHilight() const { return m_hasHilight; }
+ bool IsSelected() const { return m_hasHilight; }
bool IsExpanded() const { return !m_isCollapsed; }
bool HasPlus() const { return m_hasPlus || HasChildren(); }
bool IsBold() const { return m_isBold; }
private:
wxString m_text;
- int m_image,
- m_selImage;
+ // tree ctrl images for the normal, selected, expanded and expanded+selected
+ // states
+ int m_images[wxTreeItemIcon_Max];
wxTreeItemData *m_data;
wxTreeItemData *data)
: m_text(text)
{
- m_image = image;
- m_selImage = selImage;
+ m_images[wxTreeItemIcon_Normal] = image;
+ m_images[wxTreeItemIcon_Selected] = selImage;
+ m_images[wxTreeItemIcon_Expanded] = NO_IMAGE;
+ m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
+
m_data = data;
m_x = m_y = 0;
m_xCross = m_yCross = 0;
delete m_data;
wxASSERT_MSG( m_children.IsEmpty(),
- _T("please call DeleteChildren() before deleting the item") );
+ wxT("please call DeleteChildren() before deleting the item") );
}
void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
void wxGenericTreeItem::Reset()
{
m_text.Empty();
- m_image =
- m_selImage = -1;
+ for ( int i = 0; i < wxTreeItemIcon_Max; i++ )
+ {
+ m_images[i] = NO_IMAGE;
+ }
+
m_data = NULL;
m_x = m_y =
m_height = m_width = 0;
{
if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
{
- if (point.y<m_y+theTree->GetLineHeight(this)/2) flags|=wxTREE_HITTEST_ONITEMUPPERPART;
- else flags|=wxTREE_HITTEST_ONITEMLOWERPART;
+ if (point.y<m_y+theTree->GetLineHeight(this)/2)
+ flags |= wxTREE_HITTEST_ONITEMUPPERPART;
+ else
+ flags |= wxTREE_HITTEST_ONITEMLOWERPART;
- // FIXME why +5?
- // Because that is the size of the plus sign, RR
+ // 5 is the size of the plus sign
if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
(point.y > m_yCross-5) && (point.y < m_yCross+5) &&
(IsExpanded() || HasPlus()))
int image_h;
// assuming every image (normal and selected ) has the same size !
- if ((m_image!=-1) && theTree->m_imageListNormal)
- theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
+ if ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal )
+ theTree->m_imageListNormal->GetSize(GetImage(), image_w, image_h);
if ((image_w != -1) && (point.x <= m_x + image_w + 1))
- flags|=wxTREE_HITTEST_ONITEMICON;
+ flags |= wxTREE_HITTEST_ONITEMICON;
else
- flags|=wxTREE_HITTEST_ONITEMLABEL;
+ flags |= wxTREE_HITTEST_ONITEMLABEL;
return this;
}
- if (point.x < m_x) flags|=wxTREE_HITTEST_ONITEMIDENT;
- if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT;
+ if (point.x < m_x)
+ flags |= wxTREE_HITTEST_ONITEMIDENT;
+ if (point.x > m_x+m_width)
+ flags |= wxTREE_HITTEST_ONITEMRIGHT;
return this;
}
return NULL;
}
+int wxGenericTreeItem::GetCurrentImage() const
+{
+ int image = NO_IMAGE;
+ if ( IsExpanded() )
+ {
+ if ( IsSelected() )
+ {
+ image = GetImage(wxTreeItemIcon_SelectedExpanded);
+ }
+
+ if ( image == NO_IMAGE )
+ {
+ // we usually fall back to the normal item, but try just the
+ // expanded one (and not selected) first in this case
+ image = GetImage(wxTreeItemIcon_Expanded);
+ }
+ }
+ else // not expanded
+ {
+ if ( IsSelected() )
+ image = GetImage(wxTreeItemIcon_Selected);
+ }
+
+ // may be it doesn't have the specific image we want, try the default one
+ // instead
+ if ( image == NO_IMAGE )
+ {
+ image = GetImage();
+ }
+
+ return image;
+}
+
// -----------------------------------------------------------------------------
// wxTreeCtrl implementation
// -----------------------------------------------------------------------------
size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
{
- wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );
return item.m_pItem->GetChildrenCount(recursively);
}
wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") );
return item.m_pItem->GetText();
}
-int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
-{
- wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
-
- return item.m_pItem->GetImage();
-}
-
-int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
+ wxTreeItemIcon which) const
{
- wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );
- return item.m_pItem->GetSelectedImage();
+ return item.m_pItem->GetImage(which);
}
wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
return item.m_pItem->GetData();
}
void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
wxClientDC dc(this);
wxGenericTreeItem *pItem = item.m_pItem;
RefreshLine(pItem);
}
-void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item,
+ int image,
+ wxTreeItemIcon which)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxClientDC dc(this);
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetImage(image);
- CalculateSize(pItem, dc);
- RefreshLine(pItem);
-}
-
-void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
-{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->SetImage(image, which);
- wxClientDC dc(this);
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetSelectedImage(image);
- CalculateSize(pItem, dc);
- RefreshLine(pItem);
+ wxClientDC dc(this);
+ CalculateSize(pItem, dc);
+ RefreshLine(pItem);
}
void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
item.m_pItem->SetData(data);
}
void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
wxGenericTreeItem *pItem = item.m_pItem;
pItem->SetHasPlus(has);
void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
// avoid redrawing the tree if no real change
wxGenericTreeItem *pItem = item.m_pItem;
bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
{
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return TRUE;
}
bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
return !item.m_pItem->GetChildren().IsEmpty();
}
bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
return item.m_pItem->IsExpanded();
}
bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
- return item.m_pItem->HasHilight();
+ return item.m_pItem->IsSelected();
}
bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
return item.m_pItem->IsBold();
}
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
return item.m_pItem->GetParent();
}
wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
cookie = 0;
return GetNextChild(item, cookie);
wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
if ( (size_t)cookie < children.Count() )
wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxGenericTreeItem *i = item.m_pItem;
wxGenericTreeItem *parent = i->GetParent();
wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxGenericTreeItem *i = item.m_pItem;
wxGenericTreeItem *parent = i->GetParent();
wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
{
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
int image, int selImage,
wxTreeItemData *data)
{
- wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") );
+ wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") );
wxClientDC dc(this);
m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
int index = parent->GetChildren().Index(idPrevious.m_pItem);
wxASSERT_MSG( index != wxNOT_FOUND,
- _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
+ wxT("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
}
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
event.m_item = item;
event.SetEventObject( this );
- if ( ProcessEvent( event ) && event.m_code )
+
+// if ( ProcessEvent( event ) && event.m_code ) TODO: Was this a typo ?
+ if ( ProcessEvent( event ) && !event.IsAllowed() )
{
// cancelled by program
return;
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
event.m_item = item;
event.SetEventObject( this );
- if ( ProcessEvent( event ) && event.m_code )
+ if ( ProcessEvent( event ) && !event.IsAllowed() )
{
// cancelled by program
return;
// choice first' and 'last' between item1 and item2
if (item1->GetY()<item2->GetY())
- {
+ {
first=item1;
last=item2;
- }
+ }
else
- {
+ {
first=item2;
last=item1;
- }
+ }
- bool select=m_current->HasHilight();
+ bool select = m_current->IsSelected();
- if (TagAllChildrenUntilLast(first,last,select)) return;
+ if ( TagAllChildrenUntilLast(first,last,select) )
+ return;
TagNextChildren(first,last,select);
}
bool unselect_others,
bool extended_select)
{
- wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
+ wxGenericTreeItem *item = itemId.m_pItem;
//wxCHECK_RET( ( (!unselect_others) && is_single),
- // _T("this is a single selection tree") );
+ // wxT("this is a single selection tree") );
// to keep going anyhow !!!
if (is_single)
{
- unselect_others=TRUE;
- extended_select=FALSE;
+ if (item->IsSelected())
+ return; // nothing to do
+ unselect_others = TRUE;
+ extended_select = FALSE;
+ }
+ else if ( unselect_others && item->IsSelected() )
+ {
+ // selection change if there is more than one item currently selected
+ wxArrayTreeItemIds selected_items;
+ if ( GetSelections(selected_items) == 1 )
+ return;
}
-
- wxGenericTreeItem *item = itemId.m_pItem;
wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
event.m_item = item;
// Check if we need to toggle hilight (ctrl mode)
if (!unselect_others)
- select=!item->HasHilight();
+ select=!item->IsSelected();
m_current = m_key_current = item;
m_current->SetHilight(select);
void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
wxArrayTreeItemIds &array) const
{
- if ( item->HasHilight() )
+ if ( item->IsSelected() )
array.Add(wxTreeItemId(item));
if ( item->HasChildren() )
// first expand all parent branches
wxGenericTreeItem *parent = gitem->GetParent();
- while ( parent && !parent->IsExpanded() )
+ while ( parent )
{
Expand(parent);
-
parent = parent->GetParent();
}
- if (parent) CalculatePositions();
+ //if (parent) CalculatePositions();
ScrollTo(item);
}
{
if (!item.IsOk()) return;
+ // We have to call this here because the label in
+ // question might just have been added and no screen
+ // update taken place.
+ if (m_dirty) wxYield();
+
wxGenericTreeItem *gitem = item.m_pItem;
// now scroll to the item
static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
wxGenericTreeItem **item2)
{
- wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
+ wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxTreeCtrl::SortChildren()") );
return s_treeBeingSorted->OnCompareItems(*item1, *item2);
}
void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)
{
- wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
wxGenericTreeItem *item = itemId.m_pItem;
wxCHECK_RET( !s_treeBeingSorted,
- _T("wxTreeCtrl::SortChildren is not reentrant") );
+ wxT("wxTreeCtrl::SortChildren is not reentrant") );
wxArrayGenericTreeItems& children = item->GetChildren();
if ( children.Count() > 1 )
// May be toggle off. Then wxTreeCtrl will spread when
// necessary (which might look ugly).
#if 1
- wxPaintDC dc(this);
+ wxClientDC dc(this);
m_lineHeight = (int)(dc.GetCharHeight() + 4);
int
width = 0,
int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
{
- if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
- return item->GetHeight();
- else
- return m_lineHeight;
+ if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
+ return item->GetHeight();
+ else
+ return m_lineHeight;
}
void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
}
else
{
- wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
+ wxFAIL_MSG(wxT("wxDC::GetFont() failed!"));
}
}
int image_h = 0;
int image_w = 0;
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
- {
- m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
- image_w += 4;
- }
- else if (item->GetImage() != -1)
+ int image = item->GetCurrentImage();
+ if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+ m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+ if ( image != NO_IMAGE )
{
dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
- m_imageListNormal->Draw( item->GetSelectedImage(), dc,
- item->GetX(),
- item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
- wxIMAGELIST_DRAW_TRANSPARENT );
- dc.DestroyClippingRegion();
- }
- else if (item->GetImage() != -1)
- {
- dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
- m_imageListNormal->Draw( item->GetImage(), dc,
+ m_imageListNormal->Draw( image, dc,
item->GetX(),
item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
wxIMAGELIST_DRAW_TRANSPARENT );
item->SetCross( horizX+m_indent, y );
int exposed_x = dc.LogicalToDeviceX( 0 );
- int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+ int exposed_y = dc.LogicalToDeviceY( item->GetY() );
- if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 )) // 10000 = very much
+ if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much
{
int startX = horizX;
int endX = horizX + (m_indent-5);
dc.SetPen( m_dottedPen );
}
- if (item->HasHilight())
+ if (item->IsSelected())
{
dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
wxGenericTreeItem *i=item.m_pItem;
- wxPaintDC dc(this);
+ wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
wxGenericTreeItem *i=item.m_pItem;
- wxPaintDC dc(this);
+ wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
{
+ // We have to call this here because the label in
+ // question might just have been added and no screen
+ // update taken place.
+ if (m_dirty) wxYield();
+
wxClientDC dc(this);
PrepareDC(dc);
long x = dc.DeviceToLogicalX( (long)point.x );
if (!te.IsAllowed()) return;
+ // We have to call this here because the label in
+ // question might just have been added and no screen
+ // update taken place.
+ if (m_dirty) wxYield();
+
wxString s = m_currentEdit->GetText();
int x = m_currentEdit->GetX();
int y = m_currentEdit->GetY();
int image_h = 0;
int image_w = 0;
- if ((m_currentEdit->IsExpanded()) && (m_currentEdit->GetSelectedImage() != -1))
- {
- m_imageListNormal->GetSize( m_currentEdit->GetSelectedImage(), image_w, image_h );
- image_w += 4;
- }
- else if (m_currentEdit->GetImage() != -1)
+
+ int image = m_currentEdit->GetCurrentImage();
+ if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( m_currentEdit->GetImage(), image_w, image_h );
+ m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
x += image_w;
void wxTreeCtrl::OnMouse( wxMouseEvent &event )
{
- if (!event.LeftIsDown()) m_dragCount = 0;
-
- if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
+ if ( !(event.LeftUp() || event.RightDown() || event.LeftDClick() || event.Dragging()) ) return;
if ( !m_anchor ) return;
wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
- if (item == NULL) return; /* we hit the blank area */
-
if (event.Dragging())
{
- if (m_dragCount == 2) /* small drag latency (3?) */
- {
- m_dragCount = 0;
+ if (m_dragCount == 0)
+ m_dragStart = wxPoint(x,y);
- wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
- nevent.m_item = m_current;
- nevent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(nevent);
- }
- else
- {
- m_dragCount++;
- }
+ m_dragCount++;
+
+ if (m_dragCount != 3) return;
+
+ int command = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+ if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+
+ wxTreeEvent nevent( command, GetId() );
+ nevent.m_item = m_current;
+ nevent.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(nevent);
return;
}
+ else
+ {
+ m_dragCount = 0;
+ }
+
+ if (item == NULL) return; /* we hit the blank area */
+
+ if (event.RightDown()) {
+ wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,GetId());
+ nevent.m_item=item;
+ nevent.m_code=0;
+ nevent.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(nevent);
+ return;
+ }
if (event.LeftUp() && (item == m_current) &&
(flags & wxTREE_HITTEST_ONITEMLABEL) &&
}
else
{
- wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
+ wxFAIL_MSG(wxT("wxDC::GetFont() failed!"));
}
}
int image_h = 0;
int image_w = 0;
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+ int image = item->GetCurrentImage();
+ if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
- image_w += 4;
- }
- else if (item->GetImage() != -1)
- {
- m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+ m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
//if(GetImageList() == NULL)
// m_lineHeight = (int)(dc.GetCharHeight() + 4);
- int y = 2; //GetLineHeight(m_anchor) / 2 + 2;
+ int y = 2;
CalculateLevel( m_anchor, dc, 0, y ); // start recursion
}
wxClientDC dc(this);
PrepareDC( dc );
+ int cw = 0;
+ int ch = 0;
+ GetClientSize( &cw, &ch );
+
wxRect rect;
- rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
- rect.y = dc.LogicalToDeviceY( item->GetY());
- rect.width = 1000;
+ rect.x = dc.LogicalToDeviceX( 0 );
+ rect.y = dc.LogicalToDeviceY( item->GetY() );
+ rect.width = cw;
rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
Refresh( TRUE, &rect );
projects / wxWidgets.git / blobdiff