зеркало из https://github.com/mozilla/pjs.git
Bug 503863 - fix warnings ISO C90 forbids mixed declarations and code, r=roc
This commit is contained in:
Родитель
bf2b36394b
Коммит
888bd4b9f3
|
@ -850,9 +850,9 @@ gint
|
||||||
moz_gtk_button_get_default_overflow(gint* border_top, gint* border_left,
|
moz_gtk_button_get_default_overflow(gint* border_top, gint* border_left,
|
||||||
gint* border_bottom, gint* border_right)
|
gint* border_bottom, gint* border_right)
|
||||||
{
|
{
|
||||||
ensure_button_widget();
|
|
||||||
|
|
||||||
GtkBorder* default_outside_border;
|
GtkBorder* default_outside_border;
|
||||||
|
|
||||||
|
ensure_button_widget();
|
||||||
gtk_widget_style_get(gButtonWidget,
|
gtk_widget_style_get(gButtonWidget,
|
||||||
"default-outside-border", &default_outside_border,
|
"default-outside-border", &default_outside_border,
|
||||||
NULL);
|
NULL);
|
||||||
|
@ -873,9 +873,9 @@ static gint
|
||||||
moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
|
moz_gtk_button_get_default_border(gint* border_top, gint* border_left,
|
||||||
gint* border_bottom, gint* border_right)
|
gint* border_bottom, gint* border_right)
|
||||||
{
|
{
|
||||||
ensure_button_widget();
|
|
||||||
|
|
||||||
GtkBorder* default_border;
|
GtkBorder* default_border;
|
||||||
|
|
||||||
|
ensure_button_widget();
|
||||||
gtk_widget_style_get(gButtonWidget,
|
gtk_widget_style_get(gButtonWidget,
|
||||||
"default-border", &default_border,
|
"default-border", &default_border,
|
||||||
NULL);
|
NULL);
|
||||||
|
@ -2402,6 +2402,7 @@ moz_gtk_tabpanels_paint(GdkDrawable* drawable, GdkRectangle* rect,
|
||||||
* on the box's corner, eg. themes using the Pixbuf engine.
|
* on the box's corner, eg. themes using the Pixbuf engine.
|
||||||
*/
|
*/
|
||||||
GtkStyle* style;
|
GtkStyle* style;
|
||||||
|
GdkRectangle halfClipRect;
|
||||||
|
|
||||||
ensure_tab_widget();
|
ensure_tab_widget();
|
||||||
gtk_widget_set_direction(gTabWidget, direction);
|
gtk_widget_set_direction(gTabWidget, direction);
|
||||||
|
@ -2415,7 +2416,6 @@ moz_gtk_tabpanels_paint(GdkDrawable* drawable, GdkRectangle* rect,
|
||||||
* not drawn.
|
* not drawn.
|
||||||
* - The right half is drawn with the gap to the left outside the modified clip rect.
|
* - The right half is drawn with the gap to the left outside the modified clip rect.
|
||||||
*/
|
*/
|
||||||
GdkRectangle halfClipRect;
|
|
||||||
if (!gdk_rectangle_intersect(rect, cliprect, &halfClipRect))
|
if (!gdk_rectangle_intersect(rect, cliprect, &halfClipRect))
|
||||||
return MOZ_GTK_SUCCESS;
|
return MOZ_GTK_SUCCESS;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче