mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-15 22:52:31 +00:00
* Starting work on ElementText for displaying generic information.
* If a storage error was thrown from make_directory in EntryList::open, it would try to erase a FileMeta that wasn't inserted. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@753 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
@@ -49,14 +49,14 @@
|
||||
namespace ui {
|
||||
|
||||
struct ElementMenuEntry {
|
||||
display::TextElementString* m_element;
|
||||
display::TextElementStringBase* m_element;
|
||||
|
||||
ElementMenu::slot_type m_slotFocus;
|
||||
ElementMenu::slot_type m_slotSelect;
|
||||
ElementMenu::slot_type m_slotFocus;
|
||||
ElementMenu::slot_type m_slotSelect;
|
||||
};
|
||||
|
||||
ElementMenu::ElementMenu() :
|
||||
m_window(new WindowText),
|
||||
m_window(new WindowText(NULL, 2)),
|
||||
m_entry(entry_invalid) {
|
||||
|
||||
// Move bindings into a function that defines default bindings.
|
||||
@@ -103,10 +103,10 @@ ElementMenu::disable() {
|
||||
}
|
||||
|
||||
void
|
||||
ElementMenu::push_back(const std::string& name, const slot_type& slotSelect, const slot_type& slotFocus) {
|
||||
ElementMenu::push_back(const char* name, const slot_type& slotSelect, const slot_type& slotFocus) {
|
||||
entry_type* entry = new entry_type;
|
||||
|
||||
entry->m_element = new display::TextElementString(name);
|
||||
entry->m_element = new display::TextElementCString(name);
|
||||
entry->m_slotSelect = slotSelect;
|
||||
entry->m_slotFocus = slotFocus;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user