diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-09-04 10:11:42 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-09-04 10:11:42 +0100 |
| commit | 6d085e4322770772f9cf4105954292438dfa0930 (patch) | |
| tree | f3b260541a048055454b18d0a65ea5f25774737c /apps | |
| parent | 769f75087c414d982f33a46c5439ad63b9d4df11 (diff) | |
| download | mupdf-6d085e4322770772f9cf4105954292438dfa0930.tar.xz | |
Forms: mass renaming for the sake of consistency
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/mudraw.c | 6 | ||||
| -rw-r--r-- | apps/pdfapp.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/apps/mudraw.c b/apps/mudraw.c index 28089629..33203749 100644 --- a/apps/mudraw.c +++ b/apps/mudraw.c @@ -220,7 +220,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) } for (;widget; widget = fz_next_widget(inter, widget)) { - fz_rect rect = *fz_widget_get_bbox(widget); + fz_rect rect = *fz_widget_bbox(widget); int w = (rect.x1-rect.x0); int h = (rect.y1-rect.y0); int len; @@ -243,8 +243,8 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) break; case FZ_WIDGET_TYPE_TEXT: { - int maxlen = fz_widget_text_get_max_len(inter, widget); - int texttype = fz_widget_text_get_content_type(inter, widget); + int maxlen = fz_text_widget_max_len(inter, widget); + int texttype = fz_text_widget_content_type(inter, widget); /* If height is low, assume a single row, and base * the width off that. */ diff --git a/apps/pdfapp.c b/apps/pdfapp.c index b95b4178..3468e07d 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -1093,7 +1093,7 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta { fz_widget *widget; - widget = fz_get_focussed_widget(idoc); + widget = fz_focused_widget(idoc); if (widget) { @@ -1101,7 +1101,7 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta { case FZ_WIDGET_TYPE_TEXT: { - char *text = fz_widget_text_get_text(idoc, widget); + char *text = fz_text_widget_text(idoc, widget); char *current_text = text; int retry = 0; @@ -1110,7 +1110,7 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta current_text = wintextinput(app, current_text, retry); retry = 1; } - while (current_text && !fz_widget_text_set_text(idoc, widget, current_text)); + while (current_text && !fz_text_widget_set_text(idoc, widget, current_text)); fz_free(app->ctx, text); } @@ -1129,16 +1129,16 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta fz_try(ctx) { - nopts = fz_widget_choice_get_options(idoc, widget, NULL); + nopts = fz_choice_widget_options(idoc, widget, NULL); opts = fz_malloc(ctx, nopts * sizeof(*opts)); - (void)fz_widget_choice_get_options(idoc, widget, opts); + (void)fz_choice_widget_options(idoc, widget, opts); - nvals = fz_widget_choice_get_value(idoc, widget, NULL); + nvals = fz_choice_widget_value(idoc, widget, NULL); vals = fz_malloc(ctx, MAX(nvals,nopts) * sizeof(*vals)); - (void)fz_widget_choice_get_value(idoc, widget, vals); + (void)fz_choice_widget_value(idoc, widget, vals); if (winchoiceinput(app, nopts, opts, &nvals, vals)) - fz_widget_choice_set_value(idoc, widget, nvals, vals); + fz_choice_widget_set_value(idoc, widget, nvals, vals); } fz_always(ctx) { |