Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1126269 - Part 1: Remove nsError.h dependency from C sources in widget/gtk. r=roc

Browse Source
This commit is contained in:
Masatoshi Kimura 2015-01-30 08:53:46 +09:00
parent 83379dd84d
commit 14190d843b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/gtk/gtk2drawing.c
View File

@ -12,7 +12,7 @@
#include <gdk/gdkprivate.h>
#include <string.h>
#include "gtkdrawing.h"
#include "nsDebug.h"
#include "mozilla/Assertions.h"
#include "prinrval.h"
#include <math.h>
@ -1069,8 +1069,8 @@ moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
// XXX we should assert rect->height >= indicator_size too
// after bug 369581 is fixed.
NS_ASSERTION(rect->width >= indicator_size,
"GetMinimumWidgetSize was ignored");
MOZ_ASSERT(rect->width >= indicator_size,
"GetMinimumWidgetSize was ignored");
// Paint it center aligned in the rect.
x = rect->x + (rect->width - indicator_size) / 2;
@ -3404,7 +3404,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, GdkDrawable* drawable,
GtkWidget* moz_gtk_get_scrollbar_widget(void)
{
NS_ASSERTION(is_initialized, "Forgot to call moz_gtk_init()");
MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
ensure_scrollbar_widget();
return gHorizScrollbarWidget;
}

8
widget/gtk/gtk3drawing.c
View File

@ -12,7 +12,7 @@
#include <gdk/gdkprivate.h>
#include <string.h>
#include "gtkdrawing.h"
#include "nsDebug.h"
#include "mozilla/Assertions.h"
#include "prinrval.h"
#include <math.h>
@ -995,8 +995,8 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect,
// XXX we should assert rect->height >= indicator_size too
// after bug 369581 is fixed.
NS_ASSERTION(rect->width >= indicator_size,
"GetMinimumWidgetSize was ignored");
MOZ_ASSERT(rect->width >= indicator_size,
"GetMinimumWidgetSize was ignored");
// Paint it center aligned in the rect.
x = rect->x + (rect->width - indicator_size) / 2;
@ -3397,7 +3397,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr,
GtkWidget* moz_gtk_get_scrollbar_widget(void)
{
NS_ASSERTION(is_initialized, "Forgot to call moz_gtk_init()");
MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()");
ensure_scrollbar_widget();
return gHorizScrollbarWidget;
}

6
widget/gtkxtbin/gtk2xtbin.h
View File

@ -13,11 +13,11 @@
#include <X11/Xutil.h>
#include <X11/Xlib.h>
#ifdef MOZILLA_CLIENT
#include "nscore.h"
#include "mozilla/Types.h"
#ifdef _IMPL_GTKXTBIN_API
#define GTKXTBIN_API(type) NS_EXPORT_(type)
#define GTKXTBIN_API(type) MOZ_EXPORT type
#else
#define GTKXTBIN_API(type) NS_IMPORT_(type)
#define GTKXTBIN_API(type) MOZ_IMPORT_API type
#endif
#else
#define GTKXTBIN_API(type) type