diff options
Diffstat (limited to 'amiga')
-rw-r--r-- | amiga/Makefile.target | 2 | ||||
-rwxr-xr-x | amiga/search.c | 42 |
2 files changed, 24 insertions, 20 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index f2c429998..d7abea5cf 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -59,7 +59,7 @@ else LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib ifeq ($(SUBTARGET),os3) - LDFLAGS += -liconv + LDFLAGS += -lpbl -liconv else LDFLAGS += -lauto -lpbl -liconv endif diff --git a/amiga/search.c b/amiga/search.c index 1148f6d77..f1fad600b 100755 --- a/amiga/search.c +++ b/amiga/search.c @@ -174,6 +174,9 @@ void ami_search_open(struct gui_window *gwin) fwin->node = AddObject(window_list,AMINS_FINDWINDOW); fwin->node->objstruct = fwin; gwin->shared->searchwin = fwin; + + ActivateLayoutGadget((struct Gadget *)fwin->objects[GID_MAIN], fwin->win, + NULL, fwin->objects[GID_SEARCHSTRING]); } void ami_search_close(void) @@ -202,6 +205,26 @@ BOOL ami_search_event(void) case WMHI_GADGETUP: switch(result & WMHI_GADGETMASK) { + case GID_SEARCHSTRING: + browser_window_search_destroy_context( + fwin->gwin->shared->bw); + ami_search_set_forward_state( + true, NULL); + ami_search_set_back_state( + true, NULL); + + RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_PREV], + fwin->win, NULL, + GA_Disabled, FALSE, + TAG_DONE); + + RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_NEXT], + fwin->win, NULL, + GA_Disabled, FALSE, + TAG_DONE); + + /* fall through */ + case GID_NEXT: search_insert = true; flags = SEARCH_FLAG_FORWARDS | @@ -228,25 +251,6 @@ BOOL ami_search_event(void) flags, ami_search_string()); ActivateWindow(fwin->gwin->shared->win); - break; - - case GID_SEARCHSTRING: - browser_window_search_destroy_context( - fwin->gwin->shared->bw); - ami_search_set_forward_state( - true, NULL); - ami_search_set_back_state( - true, NULL); - - RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_PREV], - fwin->win, NULL, - GA_Disabled, FALSE, - TAG_DONE); - - RefreshSetGadgetAttrs((struct Gadget *)fwin->objects[GID_NEXT], - fwin->win, NULL, - GA_Disabled, FALSE, - TAG_DONE); break; } break; |