mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-28 01:09:39 +03:00
Use TREE_HOTLIST directly.
This commit is contained in:
parent
9f35fd3fee
commit
46e569c481
@ -57,7 +57,7 @@ void ami_hotlist_add_default_dirs(struct tree *tree)
|
|||||||
void ami_hotlist_initialise(const char *hotlist_file)
|
void ami_hotlist_initialise(const char *hotlist_file)
|
||||||
{
|
{
|
||||||
tree_hotlist_path = hotlist_file;
|
tree_hotlist_path = hotlist_file;
|
||||||
hotlist_window = ami_tree_create(hotlist_old_get_tree_flags(), NULL);
|
hotlist_window = ami_tree_create(TREE_HOTLIST, NULL);
|
||||||
|
|
||||||
if(!hotlist_window) return;
|
if(!hotlist_window) return;
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ void atari_hotlist_init(void)
|
|||||||
gemtk_wm_unlink(hl.window);
|
gemtk_wm_unlink(hl.window);
|
||||||
tree_hotlist_path = (const char*)&hl.path;
|
tree_hotlist_path = (const char*)&hl.path;
|
||||||
hl.tv = atari_treeview_create(
|
hl.tv = atari_treeview_create(
|
||||||
hotlist_old_get_tree_flags(),
|
TREE_HOTLIST,
|
||||||
hl.window,
|
hl.window,
|
||||||
handle_event
|
handle_event
|
||||||
);
|
);
|
||||||
|
@ -48,7 +48,7 @@ static const char *cocoa_hotlist_path( void )
|
|||||||
{
|
{
|
||||||
if ((self = [super initWithWindowNibName: @"BookmarksWindow"]) == nil) return nil;
|
if ((self = [super initWithWindowNibName: @"BookmarksWindow"]) == nil) return nil;
|
||||||
tree_hotlist_path = cocoa_hotlist_path();
|
tree_hotlist_path = cocoa_hotlist_path();
|
||||||
tree = [[Tree alloc] initWithFlags: hotlist_old_get_tree_flags()];
|
tree = [[Tree alloc] initWithFlags: TREE_HOTLIST];
|
||||||
hotlist_old_initialise( [tree tree], cocoa_hotlist_path(), "directory.png" );
|
hotlist_old_initialise( [tree tree], cocoa_hotlist_path(), "directory.png" );
|
||||||
nodeForMenu = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0 );
|
nodeForMenu = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 0 );
|
||||||
|
|
||||||
|
@ -48,17 +48,6 @@ bool hotlist_old_initialise(struct tree *tree, const char *hotlist_path,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get flags with which the hotlist tree should be created;
|
|
||||||
*
|
|
||||||
* \return the flags
|
|
||||||
*/
|
|
||||||
unsigned int hotlist_old_get_tree_flags(void)
|
|
||||||
{
|
|
||||||
return TREE_HOTLIST;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deletes the global history tree and saves the hotlist.
|
* Deletes the global history tree and saves the hotlist.
|
||||||
* \param hotlist_path the path where the hotlist should be saved
|
* \param hotlist_path the path where the hotlist should be saved
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
*/
|
*/
|
||||||
bool hotlist_old_initialise(struct tree *tree, const char *hotlist_path, const char* folder_icon_name);
|
bool hotlist_old_initialise(struct tree *tree, const char *hotlist_path, const char* folder_icon_name);
|
||||||
|
|
||||||
unsigned int hotlist_old_get_tree_flags(void);
|
|
||||||
void hotlist_old_cleanup(const char *hotlist_path);
|
void hotlist_old_cleanup(const char *hotlist_path);
|
||||||
|
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@ bool nsgtk_hotlist_init(const char *glade_file_location)
|
|||||||
|
|
||||||
|
|
||||||
tree_hotlist_path = nsoption_charp(hotlist_path);
|
tree_hotlist_path = nsoption_charp(hotlist_path);
|
||||||
hotlist_window = nsgtk_treeview_create(hotlist_old_get_tree_flags(), window,
|
hotlist_window = nsgtk_treeview_create(TREE_HOTLIST, window,
|
||||||
scrolled, drawing_area);
|
scrolled, drawing_area);
|
||||||
|
|
||||||
if (hotlist_window == NULL)
|
if (hotlist_window == NULL)
|
||||||
|
@ -131,7 +131,7 @@ void ro_gui_hotlist_postinitialise(void)
|
|||||||
tree_hotlist_path = nsoption_charp(hotlist_path);
|
tree_hotlist_path = nsoption_charp(hotlist_path);
|
||||||
hotlist_window.tv = ro_treeview_create(hotlist_window.window,
|
hotlist_window.tv = ro_treeview_create(hotlist_window.window,
|
||||||
hotlist_window.toolbar, &ro_hotlist_treeview_callbacks,
|
hotlist_window.toolbar, &ro_hotlist_treeview_callbacks,
|
||||||
hotlist_old_get_tree_flags());
|
TREE_HOTLIST);
|
||||||
if (hotlist_window.tv == NULL) {
|
if (hotlist_window.tv == NULL) {
|
||||||
LOG(("Failed to allocate treeview"));
|
LOG(("Failed to allocate treeview"));
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user