public:
wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
- void EndEdit(bool discardChanges = false)
- {
- if ( discardChanges )
- {
- StopEditing();
- }
- else
- {
- m_aboutToFinish = true;
-
- // Notify the owner about the changes
- AcceptChanges();
+ void EndEdit( bool discardChanges );
- // Even if vetoed, close the control (consistent with MSW)
- Finish();
- }
- }
-
- void StopEditing()
- {
- Finish();
- m_owner->OnRenameCancelled(m_itemEdited);
- }
const wxGenericTreeItem* item() const { return m_itemEdited; }
protected:
void OnKillFocus( wxFocusEvent &event );
bool AcceptChanges();
- void Finish();
+ void Finish( bool setfocus );
private:
wxGenericTreeCtrl *m_owner;
wxGenericTreeItem *m_itemEdited;
wxString m_startValue;
- bool m_finished;
bool m_aboutToFinish;
DECLARE_EVENT_TABLE()
: m_itemEdited(item), m_startValue(item->GetText())
{
m_owner = owner;
- m_finished = false;
m_aboutToFinish = false;
int w = m_itemEdited->GetWidth(),
wxPoint(x - 4, y - 4), wxSize(w + 11, h + 8));
}
+void wxTreeTextCtrl::EndEdit(bool discardChanges)
+{
+ m_aboutToFinish = true;
+
+ if ( discardChanges )
+ {
+ m_owner->OnRenameCancelled(m_itemEdited);
+
+ Finish( true );
+ }
+ else
+ {
+ // Notify the owner about the changes
+ AcceptChanges();
+
+ // Even if vetoed, close the control (consistent with MSW)
+ Finish( true );
+ }
+}
+
bool wxTreeTextCtrl::AcceptChanges()
{
const wxString value = GetValue();
return true;
}
-void wxTreeTextCtrl::Finish()
+void wxTreeTextCtrl::Finish( bool setfocus )
{
- if ( !m_finished )
- {
- m_owner->ResetTextControl();
-
- wxPendingDelete.Append(this);
+ m_owner->ResetTextControl();
- m_finished = true;
+ wxPendingDelete.Append(this);
+ if (setfocus)
m_owner->SetFocus();
- }
}
void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
switch ( event.m_keyCode )
{
case WXK_RETURN:
- EndEdit();
+ EndEdit( false );
break;
case WXK_ESCAPE:
- StopEditing();
+ EndEdit( true );
break;
default:
void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
{
- if ( !m_finished )
+ if ( !m_aboutToFinish )
{
// auto-grow the textctrl:
wxSize parentSize = m_owner->GetSize();
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
{
- if ( !m_finished && !m_aboutToFinish )
+ if ( !m_aboutToFinish )
{
- // We must finish regardless of success, otherwise we'll get
- // focus problems:
- Finish();
-
if ( !AcceptChanges() )
m_owner->OnRenameCancelled( m_itemEdited );
+
+ Finish( false );
}
- // We must let the native text control handle focus, too, otherwise
- // it could have problems with the cursor (e.g., in wxGTK).
+ // We should let the native text control handle focus, too.
event.Skip();
}
m_textCtrl = NULL;
m_renameTimer = NULL;
- m_freezeCount = 0;
m_findTimer = NULL;
m_lastOnSame = false;
-#ifdef __WXMAC_CARBON__
- m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
+#ifdef __WXMAC__
+ m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
#else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
#endif
const wxString& name )
{
#ifdef __WXMAC__
- int major,minor;
- wxGetOsVersion( &major, &minor );
+ int major, minor;
+ wxGetOsVersion(&major, &minor);
- style &= ~wxTR_LINES_AT_ROOT;
- style |= wxTR_NO_LINES;
if (major < 10)
style |= wxTR_ROW_LINES;
-
- if (style == 0 || style & wxTR_DEFAULT_STYLE)
- style |= wxTR_FULL_ROW_HIGHLIGHT;
-
#endif // __WXMAC__
-#ifdef __WXGTK20__
- style |= wxTR_NO_LINES;
-#endif
if ( !wxControl::Create( parent, id, pos, size,
style|wxHSCROLL|wxVSCROLL,
void wxGenericTreeCtrl::ChildrenClosing(wxGenericTreeItem* item)
{
if (m_textCtrl != NULL && item != m_textCtrl->item() && IsDescendantOf(item, m_textCtrl->item())) {
- m_textCtrl->StopEditing();
+ m_textCtrl->EndEdit( true );
}
if (item != m_key_current && IsDescendantOf(item, m_key_current)) {
m_key_current = NULL;
if (m_textCtrl != NULL && IsDescendantOf(item, m_textCtrl->item()))
{
// can't delete the item being edited, cancel editing it first
- m_textCtrl->StopEditing();
+ m_textCtrl->EndEdit( true );
}
wxGenericTreeItem *parent = item->GetParent();
}
item->Expand();
- if ( !m_freezeCount )
+ if ( !IsFrozen() )
{
CalculatePositions();
{
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
wxCHECK_RET( item, wxT("SelectItem(): invalid tree item") );
-
+
wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
return;
{
int flags = wxCONTROL_SELECTED;
if (m_hasFocus
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
&& IsControlActive( (ControlRef)GetHandle() )
#endif
)
#else
rect.x -= 1;
rect.width += 2;
-
+
int flags = wxCONTROL_SELECTED;
if (m_hasFocus)
flags |= wxCONTROL_FOCUSED;
{
rect.x -= 1;
rect.width += 2;
-
+
int flags = wxCONTROL_SELECTED;
if (m_hasFocus)
flags |= wxCONTROL_FOCUSED;
wxColour colText;
if ( item->IsSelected()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
// On wxMac, if the tree doesn't have the focus we draw an empty
// rectangle, so we want to make sure that the text is visible
// against the normal background, not the highlightbackground, so
void wxGenericTreeCtrl::Refresh(bool eraseBackground, const wxRect *rect)
{
- if ( !m_freezeCount )
+ if ( !IsFrozen() )
wxTreeCtrlBase::Refresh(eraseBackground, rect);
}
void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
{
- if (m_dirty || m_freezeCount)
+ if (m_dirty || IsFrozen() )
return;
wxSize client = GetClientSize();
void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
{
- if (m_dirty || m_freezeCount)
+ if (m_dirty || IsFrozen() )
return;
wxRect rect;
void wxGenericTreeCtrl::RefreshSelected()
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
// TODO: this is awfully inefficient, we should keep the list of all
void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
if ( item->IsSelected() )
}
}
-void wxGenericTreeCtrl::Freeze()
-{
- m_freezeCount++;
-}
-
-void wxGenericTreeCtrl::Thaw()
+void wxGenericTreeCtrl::DoThaw()
{
- wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
+ wxTreeCtrlBase::DoThaw();
- if ( --m_freezeCount == 0 )
- {
- if ( m_dirty )
- DoDirtyProcessing();
- else
- Refresh();
- }
+ if ( m_dirty )
+ DoDirtyProcessing();
+ else
+ Refresh();
}
// ----------------------------------------------------------------------------
void wxGenericTreeCtrl::DoDirtyProcessing()
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
m_dirty = false;
projects / wxWidgets.git / blobdiff