AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-06-08 14:30:26 +00:00
parent 73c5006d21
commit 910f1f8ce6
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/dataobj.h
View File

@ -81,6 +81,9 @@ private:
class WXDLLEXPORT wxPrivateDataObject : public wxDataObject class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
{ {
#ifdef __WXGTK__
DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
#endif
public: public:
wxPrivateDataObject(); wxPrivateDataObject();
@ -117,11 +120,8 @@ public:
virtual void GetDataHere(void *dest) const virtual void GetDataHere(void *dest) const
{ WriteData(dest); } { WriteData(dest); }
protected:
// the function which really copies the data - called by WriteData() above // the function which really copies the data - called by WriteData() above
// and uses GetSize() to get the size of the data // 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; void WriteData( const void *data, void *dest ) const;
private: private:

8
src/generic/treectrl.cpp
View File

@ -970,7 +970,9 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
if (TagAllChildrenUntilLast(first,last,select)) return; if (TagAllChildrenUntilLast(first,last,select)) return;
/*
cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl; cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl;
*/
TagNextChildren(first,last,select); TagNextChildren(first,last,select);
} }
@ -998,14 +1000,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
event.SetEventObject( this ); event.SetEventObject( this );
// Here we don't send any selection mode yet ! TO SEE // Here we don't send any selection mode yet ! TO SEE
/*
if (m_current) if (m_current)
cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl; cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
*/
if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() ) if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
return; return;
/*
if (m_current) if (m_current)
cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl; cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
*/
// ctrl press // ctrl press
if (unselect_others) if (unselect_others)

4
src/gtk/textctrl.cpp
View File

@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)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 long wxTextCtrl::GetInsertionPoint() const

4
src/gtk1/textctrl.cpp
View File

@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)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 long wxTextCtrl::GetInsertionPoint() const