diff options
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/clipboard.c | 11 | ||||
| -rwxr-xr-x | amiga/clipboard.h | 2 | ||||
| -rw-r--r-- | amiga/drag.c | 4 | ||||
| -rw-r--r-- | amiga/drag.h | 3 | ||||
| -rw-r--r-- | amiga/gui.c | 6 |
5 files changed, 12 insertions, 14 deletions
diff --git a/amiga/clipboard.c b/amiga/clipboard.c index d37fb1aec..18598798c 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -107,17 +107,6 @@ void gui_start_selection(struct gui_window *g) OnMenu(g->shared->win, AMI_MENU_CUT); } -void gui_clear_selection(struct gui_window *g) -{ - if(!g) return; - if(!g->shared->win) return; - if(nsoption_bool(kiosk_mode) == true) return; - - OffMenu(g->shared->win, AMI_MENU_CLEAR); - OffMenu(g->shared->win, AMI_MENU_CUT); - OffMenu(g->shared->win, AMI_MENU_COPY); -} - char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size_t *text_length) { struct CollectionItem *ci_new = NULL, *ci_next, *ci_curr = ci; diff --git a/amiga/clipboard.h b/amiga/clipboard.h index cf3f74087..88de64340 100755 --- a/amiga/clipboard.h +++ b/amiga/clipboard.h @@ -26,6 +26,8 @@ struct selection; struct gui_window; struct gui_window_2; +void gui_start_selection(struct gui_window *g); + void ami_clipboard_init(void); void ami_clipboard_free(void); void ami_drag_selection(struct gui_window *g); diff --git a/amiga/drag.c b/amiga/drag.c index 1123ba265..f8944d3a5 100644 --- a/amiga/drag.c +++ b/amiga/drag.c @@ -50,8 +50,8 @@ ULONG drag_icon_width; ULONG drag_icon_height; BOOL drag_in_progress = FALSE; -void gui_drag_save_object(gui_save_type type, hlcache_handle *c, - struct gui_window *g) +void gui_drag_save_object(struct gui_window *g, hlcache_handle *c, + gui_save_type type) { const char *filetype = NULL; diff --git a/amiga/drag.h b/amiga/drag.h index 218aa67f8..cfe9719ce 100644 --- a/amiga/drag.h +++ b/amiga/drag.h @@ -26,6 +26,9 @@ int drag_save; void *drag_save_data; struct gui_window *drag_save_gui; +void gui_drag_save_selection(struct gui_window *g, const char *selection); +void gui_drag_save_object(struct gui_window *g, hlcache_handle *c, gui_save_type type); + void ami_drag_save(struct Window *win); void ami_drag_icon_show(struct Window *win, const char *type); void ami_drag_icon_close(struct Window *win); diff --git a/amiga/gui.c b/amiga/gui.c index 4592eda7a..13c32cd8b 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5066,7 +5066,7 @@ void ami_gui_splash_close(Object *win_obj) if(win_obj) DisposeObject(win_obj); } -void gui_file_gadget_open(struct gui_window *g, hlcache_handle *hl, +static void gui_file_gadget_open(struct gui_window *g, hlcache_handle *hl, struct form_control *gadget) { LOG(("File open dialog rquest for %p/%p", g, gadget)); @@ -5103,6 +5103,10 @@ static struct gui_window_table ami_window_table = { .remove_caret = gui_window_remove_caret, .drag_start = gui_window_drag_start, .new_content = gui_window_new_content, + .file_gadget_open = gui_file_gadget_open, + .drag_save_object = gui_drag_save_object, + .drag_save_selection =gui_drag_save_selection, + .start_selection = gui_start_selection, /* from theme */ .set_pointer = gui_window_set_pointer, |