← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to src/generic/treectlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2007-11-06 18:25:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071106182513-809agqds6igh7mqo
Tags: 2.8.6.1-0ubuntu1
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.6.1.tar.bz2, renamed debian to debian-upstream.
* Provide a get-orig-source target to do the repackaging.
* Fix "substvar-source-version-is-deprecated" lintian warnings.
* Remove duplicate Description field in debian/control.
* Add "\" at the end of line 8 in debian/python-wxtools.menu to fix
  "bad-test-in-menu-item" lintian error.
* Provide .xpm icons to fix "menu-icon-not-in-xpm-format" lintian errors,
  changed Icon field in debian/python-wxtools.menu.
* Fix "wrong-name-for-upstream-changelog" lintian warnings.
* Remove "Application;" from Categories field in debian/pycrust.desktop,
  debian/pyshell.desktop, debian/xrced.desktop.
* Switch "Apps" to "Applications" in debian/python-wxtools.menu to fix
  "menu-item-uses-apps-section" lintian warnings.
* Drop the icon extension from debian/pycrust.desktop,
  debian/pyshell.desktop, debian/xrced.desktop.
* Add dpatch support.
* Add "WX_CONFIG" patch.
* debian/rules:
  - added .xpm icons to install-gtk-py-tools target
  - added "docs/changes.txt" to dh_installchangelogs in binary-common target
  - added "\" at the end of "install-examples install-msw-dev
    install-msw-dbg install-headers-msw" line in .PHONY

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/generic/treectlg.cpp
4
4
// Author:      Robert Roebling
5
5
// Created:     01/02/97
6
6
// Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
7
 
// Id:          $Id: treectlg.cpp,v 1.222.2.1 2007/04/26 01:03:54 RD Exp $
 
7
// Id:          $Id: treectlg.cpp 47614 2007-07-21 11:41:34Z VZ $
8
8
// Copyright:   (c) 1998 Robert Roebling and Julian Smart
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
74
74
public:
75
75
    // start editing the current item after half a second (if the mouse hasn't
76
76
    // been clicked/moved)
77
 
    enum { DELAY = 500 };
 
77
    enum { DELAY = 250 };
78
78
 
79
79
    wxTreeRenameTimer( wxGenericTreeCtrl *owner );
80
80
 
2223
2223
 
2224
2224
    if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
2225
2225
    {
2226
 
        int x, w, h;
2227
 
        x=0;
 
2226
        int x = 0, w = 0, h = 0;
2228
2227
        GetVirtualSize(&w, &h);
2229
2228
        wxRect rect( x, item->GetY()+offset, w, total_h-offset);
2230
2229
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
2796
2795
        case WXK_RIGHT:
2797
2796
            // this works the same as the down arrow except that we
2798
2797
            // also expand the item if it wasn't expanded yet
2799
 
            Expand(m_current);
 
2798
            if (m_current != GetRootItem().m_pItem || !HasFlag(wxTR_HIDE_ROOT))
 
2799
                Expand(m_current);
 
2800
            //else: don't try to expand hidden root item (which can be the
 
2801
            //      current one when the tree is empty)
 
2802
 
2800
2803
            // fall through
2801
2804
 
2802
2805
        case WXK_DOWN:
2805
2808
                {
2806
2809
                    wxTreeItemIdValue cookie;
2807
2810
                    wxTreeItemId child = GetFirstChild( m_key_current, cookie );
 
2811
                    if ( !child )
 
2812
                        break;
 
2813
 
2808
2814
                    DoSelectItem( child, unselect_others, extended_select );
2809
2815
                    m_key_current=(wxGenericTreeItem*) child.m_pItem;
2810
2816
                }