// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "treectrl.h"
#endif
#include "wx/msw/treectrl.h"
#include "wx/msw/dragimag.h"
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
-// Bug in headers, sometimes
-#ifndef TVIS_FOCUSED
- #define TVIS_FOCUSED 0x0001
-#endif
-
-#ifndef TV_FIRST
- #define TV_FIRST 0x1100
-#endif
+// macros to hide the cast ugliness
+// --------------------------------
-#ifndef TVS_CHECKBOXES
- #define TVS_CHECKBOXES 0x0100
-#endif
-
-#ifndef TVS_FULLROWSELECT
- #define TVS_FULLROWSELECT 0x1000
-#endif
-
-// old headers might miss these messages (comctl32.dll 4.71+ only)
-#ifndef TVM_SETBKCOLOR
- #define TVM_SETBKCOLOR (TV_FIRST + 29)
- #define TVM_SETTEXTCOLOR (TV_FIRST + 30)
-#endif
+// ptr is the real item id, i.e. wxTreeItemId::m_pItem
+#define HITEM_PTR(ptr) (HTREEITEM)(ptr)
-// a macro to hide the cast ugliness
-#define HITEM(item) (HTREEITEM)((item).m_pItem)
+// item here is a wxTreeItemId
+#define HITEM(item) HITEM_PTR((item).m_pItem)
// the native control doesn't support multiple selections under MSW and we
// have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
private:
wxArrayTreeItemIds& m_selections;
+
+ DECLARE_NO_COPY_CLASS(TraverseSelections)
};
// internal class for counting tree items
private:
size_t m_count;
+
+ DECLARE_NO_COPY_CLASS(TraverseCounter)
};
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxTreeCtrlStyle )
+
+wxBEGIN_FLAGS( wxTreeCtrlStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
+
+ wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
+ wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
+ wxFLAGS_MEMBER(wxTR_NO_LINES)
+ wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
+ wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
+ wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
+ wxFLAGS_MEMBER(wxTR_ROW_LINES)
+ wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
+ wxFLAGS_MEMBER(wxTR_SINGLE)
+ wxFLAGS_MEMBER(wxTR_MULTIPLE)
+ wxFLAGS_MEMBER(wxTR_EXTENDED)
+ wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
+
+wxEND_FLAGS( wxTreeCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
+ wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+ wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
+ wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
+#endif
// ----------------------------------------------------------------------------
// constants
m_textCtrl = NULL;
m_hasAnyAttr = false;
m_dragImage = NULL;
- m_htSelStart = 0;
m_pVirtualRoot = NULL;
// initialize the global array of events now as it can't be done statically
case wxTreeItemIcon_Normal:
{
const int imageNormalOld = GetItemImage(item);
- const int imageSelOld = GetItemSelectedImage(item);
+ const int imageSelOld =
+ GetItemImage(item, wxTreeItemIcon_Selected);
// always set the normal image
imageNormal = image;
// the wxTreeItemIndirectData GetItemXXXImage() will use it to
// get the images
imageNormal = GetItemImage(item);
- imageSel = GetItemSelectedImage(item);
+ imageSel = GetItemImage(item, wxTreeItemIcon_Selected);
// if it doesn't have it yet, add it
wxTreeItemIndirectData *data = new
wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
{
- wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+ wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
}
wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
{
- wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+ wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
}
wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
{
- wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+ wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
}
const wxColour& col)
{
wxTreeItemAttr *attr;
- wxMapTreeAttr::iterator it = m_attrs.find(item);
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
if ( it == m_attrs.end() )
{
m_hasAnyAttr = true;
- m_attrs[item] =
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
}
else
const wxColour& col)
{
wxTreeItemAttr *attr;
- wxMapTreeAttr::iterator it = m_attrs.find(item);
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
if ( it == m_attrs.end() )
{
m_hasAnyAttr = true;
- m_attrs[item] =
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
}
else // already in the hash
void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
{
wxTreeItemAttr *attr;
- wxMapTreeAttr::iterator it = m_attrs.find(item);
+ wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
if ( it == m_attrs.end() )
{
m_hasAnyAttr = true;
- m_attrs[item] =
+ m_attrs[item.m_pItem] =
attr = new wxTreeItemAttr;
}
else // already in the hash
// the HTREEITEM with TVM_GETITEMRECT
*(HTREEITEM *)&rect = HITEM(item);
- // false means get item rect for the whole item, not only text
- return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0;
+ // true means to get rect for just the text, not the whole line
+ if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) )
+ {
+ // if TVM_GETITEMRECT returned false, then the item is definitely not
+ // visible (because its parent is not expanded)
+ return false;
+ }
+
+ // however if it returned true, the item might still be outside the
+ // currently visible part of the tree, test for it (notice that partly
+ // visible means visible here)
+ return rect.bottom > 0 && rect.top < GetClientSize().y;
}
bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
wxTreeItemId wxTreeCtrl::GetSelection() const
{
- wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), NULL,
+ wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),
wxT("this only works with single selection controls") );
return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
return TVI_ROOT;
}
- return DoInsertItem(wxTreeItemId(), 0,
+ return DoInsertItem(wxTreeItemId(), wxTreeItemId(),
text, image, selectedImage, data);
}
size_t nCount = children.Count();
for ( size_t n = 0; n < nCount; n++ )
{
- if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
+ if ( !TreeView_DeleteItem(GetHwnd(), HITEM_PTR(children[n])) )
{
wxLogLastError(wxT("TreeView_DeleteItem"));
}
DoExpand(item, TVE_TOGGLE);
}
+#if WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
{
DoExpand(item, action);
}
+#endif
void wxTreeCtrl::Unselect()
{
for ( size_t n = 0; n < count; n++ )
{
#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
- SetItemCheck(selections[n], false);
+ SetItemCheck(HITEM_PTR(selections[n]), false);
#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
- ::UnselectItem(GetHwnd(), HITEM(selections[n]));
+ ::UnselectItem(GetHwnd(), HITEM_PTR(selections[n]));
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
}
}
switch ( nMsg )
{
case WM_RBUTTONDOWN:
- // if the item we are about to right click on
- // is not already select, remove the entire
- // previous selection
- if (!::IsItemSelected(GetHwnd(), htItem))
+ // if the item we are about to right click on is not already
+ // selected or if we click outside of any item, remove the
+ // entire previous selection
+ if ( !htItem || !::IsItemSelected(GetHwnd(), htItem) )
{
UnselectAll();
}
::SetFocus(GetHwnd(), htItem);
// reset on any click without Shift
- m_htSelStart = 0;
+ m_htSelStart.Unset();
processed = true;
}
size_t count = GetSelections(selections);
if ( count == 0 ||
count > 1 ||
- HITEM(selections[0]) != htItem )
+ HITEM_PTR(selections[0]) != htItem )
{
// clear the previously selected items, if the
// user clicked outside of the present selection.
}
// reset on any click without Shift
- m_htSelStart = 0;
+ m_htSelStart.Unset();
}
}
break;
{
// TreeView_GetItemRect() will return false if item is not visible,
// which may happen perfectly well
- if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
+ if ( TreeView_GetItemRect(GetHwnd(), HITEM_PTR(selections[n]),
&rect, true) )
{
::InvalidateRect(GetHwnd(), &rect, false);
event.m_item = info->item.hItem;
event.m_label = info->item.pszText;
- if (info->item.pszText == NULL)
- {
- event.m_editCancelled = true;
- }
- else
- {
- event.m_editCancelled = false;
- }
+ event.m_editCancelled = info->item.pszText == NULL;
break;
}
}
break;
-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+ // instead of explicitly checking for _WIN32_IE, check if the
+ // required symbols are available in the headers
+#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY
case NM_CUSTOMDRAW:
{
LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
wxTreeItemAttr * const attr = it->second;
- HFONT hFont;
- if ( attr->HasFont() )
- {
- hFont = GetHfontOf(attr->GetFont());
- }
- else
- {
- hFont = 0;
- }
-
- wxColour colText;
- if ( attr->HasTextColour() )
- {
- colText = attr->GetTextColour();
- }
- else
- {
- colText = GetForegroundColour();
- }
-
- // selection colours should override ours
- if ( nmcd.uItemState & CDIS_SELECTED )
- {
- lptvcd->clrTextBk =
- ::GetSysColor(COLOR_HIGHLIGHT);
- lptvcd->clrText =
- ::GetSysColor(COLOR_HIGHLIGHTTEXT);
- }
- else // !selected
+ // selection colours should override ours,
+ // otherwise it is too confusing ot the user
+ if ( !(nmcd.uItemState & CDIS_SELECTED) )
{
wxColour colBack;
if ( attr->HasBackgroundColour() )
{
colBack = attr->GetBackgroundColour();
+ lptvcd->clrTextBk = wxColourToRGB(colBack);
}
- else
+ }
+
+ // but we still want to keep the special foreground
+ // colour when we don't have focus (we can't keep
+ // it when we do, it would usually be unreadable on
+ // the almost inverted bg colour...)
+ if ( !(nmcd.uItemState & CDIS_SELECTED) ||
+ FindFocus() != this )
+ {
+ wxColour colText;
+ if ( attr->HasTextColour() )
{
- colBack = GetBackgroundColour();
+ colText = attr->GetTextColour();
+ lptvcd->clrText = wxColourToRGB(colText);
}
-
- lptvcd->clrText = wxColourToRGB(colText);
- lptvcd->clrTextBk = wxColourToRGB(colBack);
}
- // note that if we wanted to set colours for
- // individual columns (subitems), we would have
- // returned CDRF_NOTIFYSUBITEMREDRAW from here
- if ( hFont )
+ if ( attr->HasFont() )
{
+ HFONT hFont = GetHfontOf(attr->GetFont());
+
::SelectObject(nmcd.hdc, hFont);
*result = CDRF_NEWFONT;
}
- else
+ else // no specific font
{
*result = CDRF_DODEFAULT;
}
// we always process it
return true;
-#endif // _WIN32_IE >= 0x300
+#endif // have owner drawn support in headers
case NM_CLICK:
{
projects / wxWidgets.git / blobdiff