Upgrade WX to r74856, mainly to support @2x.

This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions

View File

@ -4,7 +4,6 @@
// Author: Robert Roebling
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: treectlg.h 65587 2010-09-22 10:06:39Z SJL $
// Copyright: (c) 1997,1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -65,7 +64,6 @@ public:
const wxValidator &validator = wxDefaultValidator,
const wxString& name = wxTreeCtrlNameStr);
// implement base class pure virtuals
// ----------------------------------
@ -169,6 +167,8 @@ public:
virtual void EndEditLabel(const wxTreeItemId& item,
bool discardChanges = false);
virtual void EnableBellOnNoMatch(bool on = true);
virtual void SortChildren(const wxTreeItemId& item);
// items geometry
@ -275,6 +275,10 @@ protected:
// incremental search data
wxString m_findPrefix;
wxTimer *m_findTimer;
// This flag is set to 0 if the bell is disabled, 1 if it is enabled and -1
// if it is globally enabled but has been temporarily disabled because we
// had already beeped for this particular search.
int m_findBell;
bool m_dropEffectAboveItem;
@ -352,6 +356,10 @@ protected:
virtual wxSize DoGetBestSize() const;
private:
// Reset the state of the last find (i.e. keyboard incremental search)
// operation.
void ResetFindState();
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);