diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 4c4e30b2ba..d9371ff7f4 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -275,49 +275,8 @@ public: SetDataObject(new wxCustomDataObject(drag_drop_format)); } - // these functions are called when data is moved over position (x, y) and - // may return either wxDragCopy, wxDragMove or wxDragNone depending on - // what would happen if the data were dropped here. - // - // the last parameter is what would happen by default and is determined by - // the platform-specific logic (for example, under Windows it's wxDragCopy - // if Ctrl key is pressed and wxDragMove otherwise) except that it will - // always be wxDragNone if the carried data is in an unsupported format. - - - // called when the mouse moves in the window - shouldn't take long to - // execute or otherwise mouse movement would be too slow. - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) - { - int flags = 0; - int viewIndex = m_listview->HitTest( wxPoint(x,y), flags); - m_listview->SetTargetedItem( viewIndex ); - - // can always drop. non item target is the filesystem placeholder. //if( wxNOT_FOUND == viewIndex ) return wxDragNone; - - return def; - } - - virtual void OnLeave() - { - m_listview->SetTargetedItem( wxNOT_FOUND ); - } - - // this function is called when data is dropped at position (x, y) - if it - // returns true, OnData() will be called immediately afterwards which will - // allow to retrieve the data dropped. - virtual bool OnDrop(wxCoord x, wxCoord y) - { - int flags = 0; - int viewIndex = m_listview->HitTest( wxPoint(x,y), flags); - return true;// can always drop. non item target is the filesystem placeholder.//( wxNOT_FOUND != viewIndex ); - } - - // may be called *only* from inside OnData() and will fill m_dataObject - // with the data from the drop source if it returns true virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) { - m_listview->SetTargetedItem( wxNOT_FOUND ); int flags = 0; int destViewIndex = m_listview->HitTest( wxPoint(x,y), flags); diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index a475dec477..5be2690874 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -40,15 +40,6 @@ IMcdList& BaseMcdListView::GetMcdProvider() return *m_CardProvider; } -void BaseMcdListView::SetTargetedItem( int sel ) -{ - if( m_TargetedItem == sel ) return; - - if( m_TargetedItem >= 0 ) RefreshItem( m_TargetedItem ); - m_TargetedItem = sel; - RefreshItem( sel ); -} - void BaseMcdListView::LoadSaveColumns( IniInterface& ini ) { FastFormatUnicode label; @@ -218,9 +209,6 @@ wxListItemAttr* MemoryCardListView_Simple::OnGetItemAttr(long item) const if( it.Slot==-1 || it.IsPresent && !it.IsEnabled) m_ItemAttr.SetTextColour( *wxLIGHT_GREY ); -/* - if( m_TargetedItem == item ) - m_ItemAttr.SetBackgroundColour( wxColour(L"Wheat") ); -*/ + return &m_ItemAttr; } diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h index 59eb6e2529..f484d2cf0f 100644 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ b/pcsx2/gui/Panels/MemoryCardPanels.h @@ -99,9 +99,6 @@ class BaseMcdListView : public wxListView protected: IMcdList* m_CardProvider; - // specifies the target of a drag&drop operation - int m_TargetedItem; - public: void (*m_externHandler)(void); void setExternHandler(void (*f)(void)){m_externHandler=f;}; @@ -124,7 +121,6 @@ public: virtual const ListViewColumnInfo& GetDefaultColumnInfo( uint idx ) const=0; virtual IMcdList& GetMcdProvider(); - virtual void SetTargetedItem( int sel ); }; // --------------------------------------------------------------------------------------