updated containers

This commit is contained in:
Pieter Vantorre 2015-05-18 14:06:09 +02:00
parent 001be6c387
commit 6a1475ed81
6 changed files with 10 additions and 10 deletions

View File

@ -128,7 +128,7 @@ int cairo_container::pt_to_px( int pt )
return ret;
}
int cairo_container::get_default_font_size()
int cairo_container::get_default_font_size() const
{
return 16;
}
@ -764,7 +764,7 @@ void cairo_container::clear_images()
unlock_images_cache();
}
const litehtml::tchar_t* cairo_container::get_default_font_name()
const litehtml::tchar_t* cairo_container::get_default_font_name() const
{
return _t("Times New Roman");
}

View File

@ -67,8 +67,8 @@ public:
virtual void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos);
virtual int pt_to_px(int pt);
virtual int get_default_font_size();
virtual const litehtml::tchar_t* get_default_font_name();
virtual int get_default_font_size() const;
virtual const litehtml::tchar_t* get_default_font_name() const;
virtual void draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker& marker);
virtual void load_image(const litehtml::tchar_t* src, const litehtml::tchar_t* baseurl, bool redraw_on_ready);
virtual void get_image_size(const litehtml::tchar_t* src, const litehtml::tchar_t* baseurl, litehtml::size& sz);

View File

@ -224,7 +224,7 @@ int container_linux::pt_to_px( int pt )
return (int) ((double) pt * dpi / 72.0);
}
int container_linux::get_default_font_size()
int container_linux::get_default_font_size() const
{
return 16;
}
@ -826,7 +826,7 @@ void container_linux::clear_images()
*/
}
const litehtml::tchar_t* container_linux::get_default_font_name()
const litehtml::tchar_t* container_linux::get_default_font_name() const
{
return "Times New Roman";
}

View File

@ -31,8 +31,8 @@ public:
virtual void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos);
virtual void fill_rect(litehtml::uint_ptr hdc, const litehtml::position& pos, const litehtml::web_color color, const litehtml::css_border_radius& radius);
virtual int pt_to_px(int pt);
virtual int get_default_font_size();
virtual const litehtml::tchar_t* get_default_font_name();
virtual int get_default_font_size() const;
virtual const litehtml::tchar_t* get_default_font_name() const;
virtual void load_image(const litehtml::tchar_t* src, const litehtml::tchar_t* baseurl, bool redraw_on_ready);
virtual void get_image_size(const litehtml::tchar_t* src, const litehtml::tchar_t* baseurl, litehtml::size& sz);
virtual void draw_image(litehtml::uint_ptr hdc, const litehtml::tchar_t* src, const litehtml::tchar_t* baseurl, const litehtml::position& pos);

View File

@ -212,7 +212,7 @@ void litehtml::win32_container::clear_images()
m_images.clear();
}
int litehtml::win32_container::get_default_font_size()
int litehtml::win32_container::get_default_font_size() const
{
return 16;
}

View File

@ -41,7 +41,7 @@ namespace litehtml
litehtml::background_repeat repeat,
litehtml::background_attachment attachment);
virtual int get_default_font_size();
virtual int get_default_font_size() const;
virtual wchar_t toupper(const wchar_t c);
virtual wchar_t tolower(const wchar_t c);
virtual void set_clip(const litehtml::position& pos, bool valid_x, bool valid_y);