Compile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
73c5006d21
commit
910f1f8ce6
@ -81,6 +81,9 @@ private:
|
||||
|
||||
class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
|
||||
{
|
||||
#ifdef __WXGTK__
|
||||
DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
|
||||
#endif
|
||||
|
||||
public:
|
||||
wxPrivateDataObject();
|
||||
@ -117,11 +120,8 @@ public:
|
||||
virtual void GetDataHere(void *dest) const
|
||||
{ WriteData(dest); }
|
||||
|
||||
protected:
|
||||
// the function which really copies the data - called by WriteData() above
|
||||
// and uses GetSize() to get the size of the data
|
||||
//
|
||||
// VZ: I really wonder why do we need it
|
||||
void WriteData( const void *data, void *dest ) const;
|
||||
|
||||
private:
|
||||
|
@ -970,7 +970,9 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
|
||||
|
||||
if (TagAllChildrenUntilLast(first,last,select)) return;
|
||||
|
||||
/*
|
||||
cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl;
|
||||
*/
|
||||
TagNextChildren(first,last,select);
|
||||
}
|
||||
|
||||
@ -998,14 +1000,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
|
||||
event.SetEventObject( this );
|
||||
// Here we don't send any selection mode yet ! TO SEE
|
||||
|
||||
/*
|
||||
if (m_current)
|
||||
cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
|
||||
*/
|
||||
|
||||
if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
|
||||
return;
|
||||
|
||||
/*
|
||||
if (m_current)
|
||||
cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
|
||||
cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
|
||||
*/
|
||||
|
||||
// ctrl press
|
||||
if (unselect_others)
|
||||
|
@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
|
||||
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
|
||||
}
|
||||
|
||||
void wxTextCtrl::ShowPosition( long pos )
|
||||
void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
|
||||
{
|
||||
SetInsertionPoint( pos );
|
||||
// SetInsertionPoint( pos );
|
||||
}
|
||||
|
||||
long wxTextCtrl::GetInsertionPoint() const
|
||||
|
@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
|
||||
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
|
||||
}
|
||||
|
||||
void wxTextCtrl::ShowPosition( long pos )
|
||||
void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
|
||||
{
|
||||
SetInsertionPoint( pos );
|
||||
// SetInsertionPoint( pos );
|
||||
}
|
||||
|
||||
long wxTextCtrl::GetInsertionPoint() const
|
||||
|
Loading…
Reference in New Issue
Block a user