X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c7df356f9cdbf99bf09f276d67f0fd65c4ca8ea..70dc287a3997b65d954bfbd5861f72696bd3dd27:/src/msw/treectrl.cpp?ds=inline diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index ef5bc1d065..5dcb0867c0 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -59,7 +59,7 @@ #include "wx/msw/gnuwin32/extra.h" #endif -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #endif @@ -130,7 +130,7 @@ static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem) return (tvi.state & TVIS_SELECTED) != 0; } -static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = TRUE) +static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true) { TV_ITEM tvi; tvi.mask = TVIF_STATE | TVIF_HANDLE; @@ -146,7 +146,7 @@ static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = TRUE) static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem) { - SelectItem(hwndTV, htItem, FALSE); + SelectItem(hwndTV, htItem, false); } static inline void ToggleItemSelection(HWND hwndTV, HTREEITEM htItem) @@ -159,10 +159,10 @@ static inline void ToggleItemSelection(HWND hwndTV, HTREEITEM htItem) static void SelectRange(HWND hwndTV, HTREEITEM htFirst, HTREEITEM htLast, - bool unselectOthers = TRUE) + bool unselectOthers = true) { // find the first (or last) item and select it - bool cont = TRUE; + bool cont = true; HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV); while ( htItem && cont ) { @@ -173,7 +173,7 @@ static void SelectRange(HWND hwndTV, SelectItem(hwndTV, htItem); } - cont = FALSE; + cont = false; } else { @@ -322,6 +322,8 @@ public: private: wxTreeItemData *m_data; + + DECLARE_NO_COPY_CLASS(wxVirtualNode) }; #ifdef __VISUALC__ @@ -331,11 +333,11 @@ private: // a macro to get the virtual root, returns NULL if none #define GET_VIRTUAL_ROOT() ((wxVirtualNode *)m_pVirtualRoot) -// returns TRUE if the item is the virtual root +// returns true if the item is the virtual root #define IS_VIRTUAL_ROOT(item) (HITEM(item) == TVI_ROOT) // a class which encapsulates the tree traversal logic: it vists all (unless -// OnVisit() returns FALSE) items under the given one +// OnVisit() returns false) items under the given one class wxTreeTraversal { public: @@ -345,12 +347,12 @@ public: } // do traverse the tree: visit all items (recursively by default) under the - // given one; return TRUE if all items were traversed or FALSE if the - // traversal was aborted because OnVisit returned FALSE - bool DoTraverse(const wxTreeItemId& root, bool recursively = TRUE); + // given one; return true if all items were traversed or false if the + // traversal was aborted because OnVisit returned false + bool DoTraverse(const wxTreeItemId& root, bool recursively = true); // override this function to do whatever is needed for each item, return - // FALSE to stop traversing + // false to stop traversing virtual bool OnVisit(const wxTreeItemId& item) = 0; protected: @@ -360,6 +362,8 @@ private: bool Traverse(const wxTreeItemId& root, bool recursively); const wxTreeCtrl *m_tree; + + DECLARE_NO_COPY_CLASS(wxTreeTraversal) }; // internal class for getting the selected items @@ -380,7 +384,7 @@ public: // can't visit a virtual node. if ( (GetTree()->GetRootItem() == item) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT)) { - return TRUE; + return true; } #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE @@ -392,7 +396,7 @@ public: m_selections.Add(item); } - return TRUE; + return true; } size_t GetCount() const { return m_selections.GetCount(); } @@ -419,7 +423,7 @@ public: { m_count++; - return TRUE; + return true; } size_t GetCount() const { return m_count; } @@ -487,6 +491,8 @@ private: // the real client data wxTreeItemData *m_data; + + DECLARE_NO_COPY_CLASS(wxTreeItemIndirectData) }; // ---------------------------------------------------------------------------- @@ -538,7 +544,7 @@ static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX]; bool wxTreeTraversal::DoTraverse(const wxTreeItemId& root, bool recursively) { if ( !OnVisit(root) ) - return FALSE; + return false; return Traverse(root, recursively); } @@ -550,16 +556,16 @@ bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively) while ( child.IsOk() ) { // depth first traversal - if ( recursively && !Traverse(child, TRUE) ) - return FALSE; + if ( recursively && !Traverse(child, true) ) + return false; if ( !OnVisit(child) ) - return FALSE; + return false; child = m_tree->GetNextChild(root, cookie); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -570,9 +576,9 @@ void wxTreeCtrl::Init() { m_imageListNormal = NULL; m_imageListState = NULL; - m_ownsImageListNormal = m_ownsImageListState = FALSE; + m_ownsImageListNormal = m_ownsImageListState = false; m_textCtrl = NULL; - m_hasAnyAttr = FALSE; + m_hasAnyAttr = false; m_dragImage = NULL; m_htSelStart = 0; m_pVirtualRoot = NULL; @@ -595,14 +601,15 @@ bool wxTreeCtrl::Create(wxWindow *parent, { Init(); - if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; + if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT ) + style |= wxBORDER_SUNKEN; - DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | - TVS_SHOWSELALWAYS; + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return false; - if ( m_windowStyle & wxCLIP_SIBLINGS ) - wstyle |= WS_CLIPSIBLINGS; + DWORD exStyle = 0; + DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle); + wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS; if ((m_windowStyle & wxTR_NO_LINES) == 0) wstyle |= TVS_HASLINES; @@ -637,7 +644,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, // Create the tree control. if ( !MSWCreateControl(WC_TREEVIEW, wstyle) ) - return FALSE; + return false; #if wxUSE_COMCTL32_SAFELY wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); @@ -671,7 +678,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, // create a mono bitmap of the standard size int x = GetSystemMetrics(SM_CXMENUCHECK); int y = GetSystemMetrics(SM_CYMENUCHECK); - wxImageList imagelistCheckboxes(x, y, FALSE, 2); + wxImageList imagelistCheckboxes(x, y, false, 2); HBITMAP hbmpCheck = CreateBitmap(x, y, // bitmap size 1, // # of color planes 1, // # bits needed for one pixel @@ -710,7 +717,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, SetSize(pos.x, pos.y, size.x, size.y); - return TRUE; + return true; } wxTreeCtrl::~wxTreeCtrl() @@ -720,11 +727,11 @@ wxTreeCtrl::~wxTreeCtrl() { for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() ) { - delete (wxTreeItemAttr *)node->Data(); + delete (wxTreeItemAttr *)node->GetData(); } // prevent TVN_DELETEITEM handler from deleting the attributes again! - m_hasAnyAttr = FALSE; + m_hasAnyAttr = false; } DeleteTextCtrl(); @@ -745,17 +752,17 @@ wxTreeCtrl::~wxTreeCtrl() bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const { - wxCHECK_MSG( tvItem->hItem != TVI_ROOT, FALSE, + wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false, _T("can't retrieve virtual root item") ); if ( !TreeView_GetItem(GetHwnd(), tvItem) ) { wxLogLastError(wxT("TreeView_GetItem")); - return FALSE; + return false; } - return TRUE; + return true; } void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem) @@ -805,26 +812,26 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList) delete m_imageListNormal; SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL); - m_ownsImageListNormal = FALSE; + m_ownsImageListNormal = false; } void wxTreeCtrl::SetStateImageList(wxImageList *imageList) { if (m_ownsImageListState) delete m_imageListState; SetAnyImageList(m_imageListState = imageList, TVSIL_STATE); - m_ownsImageListState = FALSE; + m_ownsImageListState = false; } void wxTreeCtrl::AssignImageList(wxImageList *imageList) { SetImageList(imageList); - m_ownsImageListNormal = TRUE; + m_ownsImageListNormal = true; } void wxTreeCtrl::AssignStateImageList(wxImageList *imageList) { SetStateImageList(imageList); - m_ownsImageListState = TRUE; + m_ownsImageListState = true; } size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, @@ -843,24 +850,24 @@ bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour) { #if !wxUSE_COMCTL32_SAFELY if ( !wxWindowBase::SetBackgroundColour(colour) ) - return FALSE; + return false; SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel()); #endif - return TRUE; + return true; } bool wxTreeCtrl::SetForegroundColour(const wxColour &colour) { #if !wxUSE_COMCTL32_SAFELY if ( !wxWindowBase::SetForegroundColour(colour) ) - return FALSE; + return false; SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel()); #endif - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -891,6 +898,20 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) wxTreeViewItem tvItem(item, TVIF_TEXT); tvItem.pszText = (wxChar *)text.c_str(); // conversion is ok DoSetItem(&tvItem); + + // when setting the text of the item being edited, the text control should + // be updated to reflect the new text as well, otherwise calling + // SetItemText() in the OnBeginLabelEdit() handler doesn't have any effect + // + // don't use GetEditControl() here because m_textCtrl is not set yet + HWND hwndEdit = TreeView_GetEditControl(GetHwnd()); + if ( hwndEdit ) + { + if ( item == GetSelection() ) + { + ::SetWindowText(hwndEdit, text); + } + } } int wxTreeCtrl::DoGetItemImageFromData(const wxTreeItemId& item, @@ -1117,7 +1138,7 @@ bool wxTreeCtrl::HasIndirectData(const wxTreeItemId& item) const wxTreeViewItem tvItem(item, TVIF_PARAM); if ( !DoGetItem(&tvItem) ) { - return FALSE; + return false; } wxTreeItemData *data = (wxTreeItemData *)tvItem.lParam; @@ -1167,10 +1188,46 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item) } } +wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullColour; + } + + return attr->GetTextColour(); +} + +wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullColour; + } + + return attr->GetBackgroundColour(); +} + +wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const +{ + long id = (long)(WXHTREEITEM)item; + wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); + if ( !attr ) + { + return wxNullFont; + } + + return attr->GetFont(); +} + void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, const wxColour& col) { - m_hasAnyAttr = TRUE; + m_hasAnyAttr = true; long id = (long)(WXHTREEITEM)item; wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); @@ -1188,7 +1245,7 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) { - m_hasAnyAttr = TRUE; + m_hasAnyAttr = true; long id = (long)(WXHTREEITEM)item; wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); @@ -1205,7 +1262,7 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font) { - m_hasAnyAttr = TRUE; + m_hasAnyAttr = true; long id = (long)(WXHTREEITEM)item; wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); @@ -1226,6 +1283,12 @@ void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font) bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const { + if ( item == wxTreeItemId(TVI_ROOT) ) + { + // virtual (hidden) root is never visible + return false; + } + // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect RECT rect; @@ -1233,8 +1296,8 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const // the HTREEITEM with TVM_GETITEMRECT *(WXHTREEITEM *)&rect = (WXHTREEITEM)item; - // FALSE means get item rect for the whole item, not only text - return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0; + // false means get item rect for the whole item, not only text + return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0; } bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const @@ -1293,7 +1356,7 @@ wxTreeItemId wxTreeCtrl::GetSelection() const return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd())); } -wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const +wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const { HTREEITEM hItem; @@ -1603,8 +1666,14 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) void wxTreeCtrl::DeleteAllItems() { - // delete stored root item. - delete GET_VIRTUAL_ROOT(); + // delete the "virtual" root item. + if ( GET_VIRTUAL_ROOT() ) + { + delete GET_VIRTUAL_ROOT(); + m_pVirtualRoot = NULL; + } + + // and all the real items if ( !TreeView_DeleteAllItems(GetHwnd()) ) { @@ -1621,11 +1690,8 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag) wxT("Unknown flag in wxTreeCtrl::DoExpand") ); // A hidden root can be neither expanded nor collapsed. - if ( (HITEM(item) == TVI_ROOT) && (m_windowStyle & wxTR_HIDE_ROOT) ) - { - // No action will be taken. - return; - } + wxCHECK_RET( !(m_windowStyle & wxTR_HIDE_ROOT) || (HITEM(item) != TVI_ROOT), + wxT("Can't expand/collapse hidden root node!") ) // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must // emulate them. This behaviour has changed slightly with comctl32.dll @@ -1699,7 +1765,7 @@ void wxTreeCtrl::UnselectAll() for ( size_t n = 0; n < count; n++ ) { #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE - SetItemCheck(selections[n], FALSE); + SetItemCheck(selections[n], false); #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE ::UnselectItem(GetHwnd(), HITEM(selections[n])); #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE @@ -1764,26 +1830,8 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) } } -wxTextCtrl* wxTreeCtrl::GetEditControl() const +wxTextCtrl *wxTreeCtrl::GetEditControl() const { - // normally, we could try to do something like this to return something - // even when the editing was started by the user and not by calling - // EditLabel() - but as nobody has asked for this so far and there might be - // problems in the code below, I leave it disabled for now (VZ) -#if 0 - if ( !m_textCtrl ) - { - HWND hwndText = TreeView_GetEditControl(GetHwnd()); - if ( hwndText ) - { - m_textCtrl = new wxTextCtrl(this, -1); - m_textCtrl->Hide(); - m_textCtrl->SetHWND((WXHWND)hwndText); - } - //else: not editing label right now - } -#endif // 0 - return m_textCtrl; } @@ -1813,20 +1861,19 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item, DeleteTextCtrl(); + m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject(); HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item)); // this is not an error - the TVN_BEGINLABELEDIT handler might have - // returned FALSE + // returned false if ( !hWnd ) { + delete m_textCtrl; + m_textCtrl = NULL; return NULL; } - m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject(); - m_textCtrl->SetParent(this); - m_textCtrl->SetHWND((WXHWND)hWnd); - m_textCtrl->SubclassWin((WXHWND)hWnd); - + // textctrl is subclassed in MSWOnNotify return m_textCtrl; } @@ -1874,17 +1921,24 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, bool textOnly) const { RECT rc; + + // Virtual root items have no bounding rectangle + if ( IS_VIRTUAL_ROOT(item) ) + { + return false; + } + if ( TreeView_GetItemRect(GetHwnd(), HITEM(item), &rc, textOnly) ) { rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom)); - return TRUE; + return true; } else { // couldn't retrieve rect: for example, item isn't visible - return FALSE; + return false; } } @@ -1971,11 +2025,11 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id) else { // nothing done - return FALSE; + return false; } // command processed - return TRUE; + return true; } // we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we @@ -1984,20 +2038,35 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id) // instead of passing by wxWin events long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - bool processed = FALSE; + bool processed = false; long rc = 0; bool isMultiple = (GetWindowStyle() & wxTR_MULTIPLE) != 0; if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) ) { - // we only process mouse messages here and these parameters have the same - // meaning for all of them + // we only process mouse messages here and these parameters have the + // same meaning for all of them int x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y); 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)) + { + UnselectAll(); + } + + // select item and set the focus to the + // newly selected item + ::SelectItem(GetHwnd(), htItem); + ::SetFocus(GetHwnd(), htItem); + break; + #if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE case WM_LBUTTONDOWN: if ( htItem && isMultiple ) @@ -2014,7 +2083,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // reset on any click without Shift m_htSelStart = 0; - processed = TRUE; + processed = true; } else if ( wParam & MK_SHIFT ) { @@ -2033,17 +2102,27 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) ::SetFocus(GetHwnd(), htItem); - processed = TRUE; + processed = true; } else // normal click { - // clear the selection and then let the default handler - // do the job - UnselectAll(); - - // prevent the click from starting in-place editing - // when there was no selection in the control - TreeView_SelectItem(GetHwnd(), 0); + // avoid doing anything if we click on the only + // currently selected item + wxArrayTreeItemIds selections; + size_t count = GetSelections(selections); + if ( count == 0 || + count > 1 || + HITEM(selections[0]) != htItem ) + { + // clear the previously selected items + UnselectAll(); + + // prevent the click from starting in-place editing + // which should only happen if we click on the + // already selected item (and nothing else is + // selected) + TreeView_SelectItem(GetHwnd(), 0); + } // reset on any click without Shift m_htSelStart = 0; @@ -2102,12 +2181,12 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) RECT rect; for ( size_t n = 0; n < count; n++ ) { - // TreeView_GetItemRect() will return FALSE if item is not visible, + // TreeView_GetItemRect() will return false if item is not visible, // which may happen perfectly well if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]), - &rect, TRUE) ) + &rect, true) ) { - ::InvalidateRect(GetHwnd(), &rect, FALSE); + ::InvalidateRect(GetHwnd(), &rect, false); } } } @@ -2138,7 +2217,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) ::SelectItem(GetHwnd(), htSel); } - processed = TRUE; + processed = true; } else if ( wParam == VK_UP || wParam == VK_DOWN ) { @@ -2172,11 +2251,24 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) ::SetFocus(GetHwnd(), htNext); } - processed = TRUE; + processed = true; } } } #endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE + else if ( nMsg == WM_CHAR ) + { + // don't let the control process Space and Return keys because it + // doesn't do anything useful with them anyhow but always beeps + // annoyingly when it receives them and there is no way to turn it off + // simply if you just process TREEITEM_ACTIVATED event to which Space + // and Enter presses are mapped in your code + if ( wParam == VK_SPACE || wParam == VK_RETURN ) + { + processed = true; + } + } + if ( !processed ) rc = wxControl::MSWWindowProc(nMsg, wParam, lParam); @@ -2221,6 +2313,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.m_item = (WXHTREEITEM) info->item.hItem; event.m_label = info->item.pszText; + event.m_editCancelled = false; } break; @@ -2247,7 +2340,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.m_item = (WXHTREEITEM)info->item.hItem; event.m_label = info->item.pszText; if (info->item.pszText == NULL) - return FALSE; + { + event.m_editCancelled = true; + } + else + { + event.m_editCancelled = false; + } break; } @@ -2288,8 +2387,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) break; } - int how = (int)hdr->code == TVN_ITEMEXPANDING ? IDX_DOING - : IDX_DONE; + int how = hdr->code == TVN_ITEMEXPANDING ? IDX_DOING + : IDX_DONE; eventType = gs_expandEvents[what][how]; @@ -2302,12 +2401,29 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_COMMAND_TREE_KEY_DOWN; TV_KEYDOWN *info = (TV_KEYDOWN *)lParam; - // we pass 0 as 2 last CreateKeyEvent() parameters because we - // don't have access to the real key press flags here - but as - // it is only used to determin wxKeyEvent::m_altDown flag it's - // not too bad + // fabricate the lParam and wParam parameters sufficiently + // similar to the ones from a "real" WM_KEYDOWN so that + // CreateKeyEvent() works correctly + WXLPARAM lParam = +// (::GetKeyState(VK_MENU) & 0x100 ? KF_ALTDOWN : 0) << 16; + // Returns different negative values on WinME and WinNT, + // so simply test for negative value. + (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16; + + WXWPARAM wParam = info->wVKey; + + int keyCode = wxCharCodeMSWToWX(info->wVKey); + if ( !keyCode ) + { + // wxCharCodeMSWToWX() returns 0 to indicate that this is a + // simple ASCII key + keyCode = wParam; + } + event.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, - wxCharCodeMSWToWX(info->wVKey)); + keyCode, + lParam, + wParam); // a separate event for Space/Return if ( !wxIsCtrlDown() && !wxIsShiftDown() && @@ -2327,20 +2443,34 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } break; - case TVN_SELCHANGED: + // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of + // TVN_SELCHANGEDW in Unicode mode under Win98. Therefore + // we have to handle both messages: + case TVN_SELCHANGEDA: + case TVN_SELCHANGEDW: eventType = wxEVT_COMMAND_TREE_SEL_CHANGED; // fall through - case TVN_SELCHANGING: + case TVN_SELCHANGINGA: + case TVN_SELCHANGINGW: { if ( eventType == wxEVT_NULL ) eventType = wxEVT_COMMAND_TREE_SEL_CHANGING; //else: already set above - NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam; - - event.m_item = (WXHTREEITEM) tv->itemNew.hItem; - event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; + if (hdr->code == TVN_SELCHANGINGW || + hdr->code == TVN_SELCHANGEDW) + { + NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam; + event.m_item = (WXHTREEITEM) tv->itemNew.hItem; + event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; + } + else + { + NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam; + event.m_item = (WXHTREEITEM) tv->itemNew.hItem; + event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; + } } break; @@ -2371,17 +2501,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } HFONT hFont; - wxColour colText, colBack; if ( attr->HasFont() ) { - wxFont font = attr->GetFont(); - hFont = (HFONT)font.GetResourceHandle(); + hFont = GetHfontOf(attr->GetFont()); } else { hFont = 0; } + wxColour colText; if ( attr->HasTextColour() ) { colText = attr->GetTextColour(); @@ -2394,16 +2523,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // selection colours should override ours if ( nmcd.uItemState & CDIS_SELECTED ) { - DWORD clrBk = ::GetSysColor(COLOR_HIGHLIGHT); - lptvcd->clrTextBk = clrBk; - - // try to make the text visible - lptvcd->clrText = wxColourToRGB(colText); - lptvcd->clrText |= ~clrBk; - lptvcd->clrText &= 0x00ffffff; + lptvcd->clrTextBk = + ::GetSysColor(COLOR_HIGHLIGHT); + lptvcd->clrText = + ::GetSysColor(COLOR_HIGHLIGHTTEXT); } - else + else // !selected { + wxColour colBack; if ( attr->HasBackgroundColour() ) { colBack = attr->GetBackgroundColour(); @@ -2439,7 +2566,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } // we always process it - return TRUE; + return true; #endif // _WIN32_IE >= 0x300 case NM_DBLCLK: @@ -2483,7 +2610,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // the return code of this event handler as the return value for // NM_DBLCLK - otherwise, double clicking the item to toggle its // expanded status would never work - *result = FALSE; + *result = false; break; case TVN_BEGINDRAG: @@ -2521,22 +2648,48 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) delete data; // may be NULL, ok } - processed = TRUE; // Make sure we don't get called twice + processed = true; // Make sure we don't get called twice } break; case TVN_BEGINLABELEDIT: - // return TRUE to cancel label editing + // return true to cancel label editing *result = !event.IsAllowed(); + // set ES_WANTRETURN ( like we do in BeginLabelEdit ) + if(event.IsAllowed()) + { + HWND hText = TreeView_GetEditControl(GetHwnd()); + if(hText != NULL) + { + // MBN: if m_textCtrl already has an HWND, it is a stale + // pointer from a previous edit (because the user + // didn't modify the label before dismissing the control, + // and TVN_ENDLABELEDIT was not sent), so delete it + if(m_textCtrl && m_textCtrl->GetHWND() != 0) + DeleteTextCtrl(); + if(!m_textCtrl) + m_textCtrl = new wxTextCtrl(); + m_textCtrl->SetParent(this); + m_textCtrl->SetHWND((WXHWND)hText); + m_textCtrl->SubclassWin((WXHWND)hText); + + // set wxTE_PROCESS_ENTER style for the text control to + // force it to process the Enter presses itself, otherwise + // they could be stolen from it by the dialog + // navigation code + m_textCtrl->SetWindowStyle(m_textCtrl->GetWindowStyle() + | wxTE_PROCESS_ENTER); + } + } break; case TVN_ENDLABELEDIT: - // return TRUE to set the label to the new string: note that we + // return true to set the label to the new string: note that we // also must pretend that we did process the message or it is going - // to be passed to DefWindowProc() which will happily return FALSE + // to be passed to DefWindowProc() which will happily return false // cancelling the label change *result = event.IsAllowed(); - processed = TRUE; + processed = true; // ensure that we don't have the text ctrl which is going to be // deleted any more @@ -2545,7 +2698,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case TVN_SELCHANGING: case TVN_ITEMEXPANDING: - // return TRUE to prevent the action from happening + // return true to prevent the action from happening *result = !event.IsAllowed(); break; @@ -2554,16 +2707,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // an image depending on the expanded/collapsed state - bug in // comctl32.dll or our code? { - NM_TREEVIEW* tv = (NM_TREEVIEW*)lParam; - if ( tv->action == TVE_EXPAND ) - { - wxTreeItemId id = (WXHTREEITEM)tv->itemNew.hItem; + NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam; + wxTreeItemId id = (WXHTREEITEM)tv->itemNew.hItem; - int image = GetItemImage(id, wxTreeItemIcon_Expanded); - if ( image != -1 ) - { - RefreshItem(id); - } + int image = GetItemImage(id, wxTreeItemIcon_Expanded); + if ( image != -1 ) + { + RefreshItem(id); } } break; @@ -2571,7 +2721,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case TVN_GETDISPINFO: // NB: so far the user can't set the image himself anyhow, so do it // anyway - but this may change later -// if ( /* !processed && */ 1 ) + //if ( /* !processed && */ 1 ) { wxTreeItemId item = event.m_item; TV_DISPINFO *info = (TV_DISPINFO *)lParam;