1. wxDataObject compilation fixes (can't test if it works right now, sorry)
2. wxProgressDialog ctor has "style" parameter 3. the controls samples now also demonstrates wxUpdateUI events and wxProgressDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -56,7 +56,7 @@ wxDataFormat::wxDataFormat( const wxString &id )
|
||||
SetId( id );
|
||||
}
|
||||
|
||||
wxDataFormat::wxDataFormat( wxDataFormat &format )
|
||||
wxDataFormat::wxDataFormat( const wxDataFormat &format )
|
||||
{
|
||||
if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
|
||||
m_type = format.GetType();
|
||||
@@ -192,7 +192,7 @@ size_t wxDataBroker::GetFormatCount() const
|
||||
return m_dataObjects.GetCount();
|
||||
}
|
||||
|
||||
wxDataFormat &wxDataBroker::GetPreferredFormat() const
|
||||
wxDataFormatId wxDataBroker::GetPreferredFormat() const
|
||||
{
|
||||
wxNode *node = m_dataObjects.Nth( m_preferred );
|
||||
|
||||
@@ -200,7 +200,7 @@ wxDataFormat &wxDataBroker::GetPreferredFormat() const
|
||||
|
||||
wxDataObject* data_obj = (wxDataObject*)node->Data();
|
||||
|
||||
return data_obj->GetFormat();
|
||||
return data_obj->GetFormat().GetType();
|
||||
}
|
||||
|
||||
wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const
|
||||
|
Reference in New Issue
Block a user