Commit e7a266ad authored by Matthias Clasen's avatar Matthias Clasen

css color: Use gtk_internal_return_if_fail

parent 9cd30240
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "gtkstylepropertyprivate.h" #include "gtkstylepropertyprivate.h"
#include "gtkwin32themeprivate.h" #include "gtkwin32themeprivate.h"
#include "gtkprivate.h"
typedef enum { typedef enum {
COLOR_TYPE_LITERAL, COLOR_TYPE_LITERAL,
COLOR_TYPE_NAME, COLOR_TYPE_NAME,
...@@ -141,8 +143,8 @@ _gtk_css_color_value_resolve (GtkCssValue *color, ...@@ -141,8 +143,8 @@ _gtk_css_color_value_resolve (GtkCssValue *color,
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (color != NULL, NULL); gtk_internal_return_val_if_fail (color != NULL, NULL);
g_return_val_if_fail (provider == NULL || GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); gtk_internal_return_val_if_fail (provider == NULL || GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
switch (color->type) switch (color->type)
{ {
...@@ -466,7 +468,7 @@ _gtk_css_color_value_new_name (const gchar *name) ...@@ -466,7 +468,7 @@ _gtk_css_color_value_new_name (const gchar *name)
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (name != NULL, NULL); gtk_internal_return_val_if_fail (name != NULL, NULL);
value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR); value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_NAME; value->type = COLOR_TYPE_NAME;
...@@ -481,7 +483,7 @@ _gtk_css_color_value_new_shade (GtkCssValue *color, ...@@ -481,7 +483,7 @@ _gtk_css_color_value_new_shade (GtkCssValue *color,
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (color->class == &GTK_CSS_VALUE_COLOR, NULL); gtk_internal_return_val_if_fail (color->class == &GTK_CSS_VALUE_COLOR, NULL);
value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR); value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_SHADE; value->type = COLOR_TYPE_SHADE;
...@@ -497,7 +499,7 @@ _gtk_css_color_value_new_alpha (GtkCssValue *color, ...@@ -497,7 +499,7 @@ _gtk_css_color_value_new_alpha (GtkCssValue *color,
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (color->class == &GTK_CSS_VALUE_COLOR, NULL); gtk_internal_return_val_if_fail (color->class == &GTK_CSS_VALUE_COLOR, NULL);
value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR); value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_ALPHA; value->type = COLOR_TYPE_ALPHA;
...@@ -514,8 +516,8 @@ _gtk_css_color_value_new_mix (GtkCssValue *color1, ...@@ -514,8 +516,8 @@ _gtk_css_color_value_new_mix (GtkCssValue *color1,
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (color1->class == &GTK_CSS_VALUE_COLOR, NULL); gtk_internal_return_val_if_fail (color1->class == &GTK_CSS_VALUE_COLOR, NULL);
g_return_val_if_fail (color2->class == &GTK_CSS_VALUE_COLOR, NULL); gtk_internal_return_val_if_fail (color2->class == &GTK_CSS_VALUE_COLOR, NULL);
value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR); value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_MIX; value->type = COLOR_TYPE_MIX;
...@@ -532,7 +534,7 @@ _gtk_css_color_value_new_win32 (const gchar *theme_class, ...@@ -532,7 +534,7 @@ _gtk_css_color_value_new_win32 (const gchar *theme_class,
{ {
GtkCssValue *value; GtkCssValue *value;
g_return_val_if_fail (theme_class != NULL, NULL); gtk_internal_return_val_if_fail (theme_class != NULL, NULL);
value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR); value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_WIN32; value->type = COLOR_TYPE_WIN32;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment