diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/form.cc | 2 | ||||
| -rw-r--r-- | src/html.cc | 4 | ||||
| -rw-r--r-- | src/image.cc | 8 | ||||
| -rw-r--r-- | src/image.hh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/form.cc b/src/form.cc index b6df56f5..c5bb10af 100644 --- a/src/form.cc +++ b/src/form.cc @@ -2008,7 +2008,7 @@ static Embed *Html_input_image(DilloHtml *html, const char *tag, int tagsize) // At this point, we know that Image->ir represents an image // widget. Notice that the order of the casts matters, because // of multiple inheritance. - dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)Image->img_rnd; + dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)Image->img_rndr; dwi->setStyle (html->backgroundStyle ()); ResourceFactory *factory = HT2LT(html)->getResourceFactory(); ComplexButtonResource *complex_b_r = diff --git a/src/html.cc b/src/html.cc index 00882ccc..1257c102 100644 --- a/src/html.cc +++ b/src/html.cc @@ -2301,7 +2301,7 @@ static void Html_tag_content_img(DilloHtml *html, const char *tag, int tagsize) // At this point, we know that Image->ir represents an image // widget. Notice that the order of the casts matters, because of // multiple inheritance. - dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)Image->img_rnd; + dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)Image->img_rndr; HT2TB(html)->addWidget(dwi, html->style()); /* Image maps */ @@ -2364,7 +2364,7 @@ static void Html_tag_close_map(DilloHtml *html) // widget. (Really? Is this assumtion safe?) Notice that the // order of the casts matters, because of multiple // inheritance. - dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)img->img_rnd; + dw::Image *dwi = (dw::Image*)(dw::core::ImgRenderer*)img->img_rndr; dwi->forceMapRedraw(); } } diff --git a/src/image.cc b/src/image.cc index 7e6c27a4..9915023a 100644 --- a/src/image.cc +++ b/src/image.cc @@ -24,19 +24,19 @@ using namespace dw::core; // Image to Object-ImgRenderer macro -#define I2IR(Image) ((dw::core::ImgRenderer*)(Image->img_rnd)) +#define I2IR(Image) ((dw::core::ImgRenderer*)(Image->img_rndr)) /* * Create and initialize a new image structure. */ -DilloImage *a_Image_new(void *layout, void *img_rnd, int32_t bg_color) +DilloImage *a_Image_new(void *layout, void *img_rndr, int32_t bg_color) { DilloImage *Image; Image = dNew(DilloImage, 1); Image->layout = layout; - Image->img_rnd = img_rnd; + Image->img_rndr = img_rndr; Image->width = 0; Image->height = 0; Image->bg_color = bg_color; @@ -67,7 +67,7 @@ DilloImage *a_Image_new_with_dw(void *layout, const char *alt_text, */ void *a_Image_get_dw(DilloImage *Image) { - return (dw::Image*)(dw::core::ImgRenderer*)Image->img_rnd; + return (dw::Image*)(dw::core::ImgRenderer*)Image->img_rndr; } /* * Deallocate an Image structure diff --git a/src/image.hh b/src/image.hh index 52bd1cf1..39fe0405 100644 --- a/src/image.hh +++ b/src/image.hh @@ -44,7 +44,7 @@ typedef enum { } ImageState; struct _DilloImage { - void *layout, *img_rnd; + void *layout, *img_rndr; /* Parameters as told by image data */ uint_t width; @@ -62,7 +62,7 @@ struct _DilloImage { /* * Function prototypes */ -DilloImage *a_Image_new(void *layout, void *img_rnd, int32_t bg_color); +DilloImage *a_Image_new(void *layout, void *img_rndr, int32_t bg_color); DilloImage *a_Image_new_with_dw(void *layout, const char *alt_text, int32_t bg_color); void *a_Image_get_dw(DilloImage *Image); |