1. wxDropTarget::OnData() returns wxDragResult now, not bool
2. fixed assert failure in wxMSW::wxListBox 3. wxFileHistory automatically deletes non existinf files from menu 4. wxDropTarget coordinates are client (and not screen) under MSW too 5. wxConvertBitmapToDib and vice versa seem to work! 6. client data field if filled by wxListBox and wxChoice and it's also deleted (this just wasn't done before!) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -706,7 +706,6 @@ wxDocManager::wxDocManager(long flags, bool initialize)
|
||||
m_currentView = (wxView *) NULL;
|
||||
m_maxDocsOpen = 10000;
|
||||
m_fileHistory = (wxFileHistory *) NULL;
|
||||
m_lastDirectory = wxT("") ;
|
||||
if (initialize)
|
||||
Initialize();
|
||||
}
|
||||
@@ -1910,11 +1909,8 @@ void wxFileHistory::RemoveFileFromHistory(int i)
|
||||
{
|
||||
wxMenu* menu = (wxMenu*) node->Data();
|
||||
|
||||
// wxMenu::Delete() is missing from wxGTK, so this can't be done :-(
|
||||
#if 0
|
||||
// delete the menu items
|
||||
menu->Delete(wxID_FILE1 + i);
|
||||
#endif
|
||||
|
||||
// delete the element from the array (could use memmove() too...)
|
||||
delete [] m_fileHistory[i];
|
||||
@@ -1933,11 +1929,6 @@ void wxFileHistory::RemoveFileFromHistory(int i)
|
||||
menu->SetLabel(wxID_FILE1 + j, buf);
|
||||
}
|
||||
|
||||
// to be removed as soon as wxMenu::Delete() is implemented
|
||||
#if 1
|
||||
menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, wxT(""));
|
||||
#endif
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
m_fileHistoryN--;
|
||||
@@ -1945,10 +1936,17 @@ void wxFileHistory::RemoveFileFromHistory(int i)
|
||||
|
||||
wxString wxFileHistory::GetHistoryFile(int i) const
|
||||
{
|
||||
if (i < m_fileHistoryN)
|
||||
return wxString(m_fileHistory[i]);
|
||||
wxString s;
|
||||
if ( i < m_fileHistoryN )
|
||||
{
|
||||
s = m_fileHistory[i];
|
||||
}
|
||||
else
|
||||
return wxString("");
|
||||
{
|
||||
wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
void wxFileHistory::UseMenu(wxMenu *menu)
|
||||
|
Reference in New Issue
Block a user