summaryrefslogtreecommitdiff
path: root/gdk/gdkscreen.c
diff options
context:
space:
mode:
authorMichael Natterer <mitch@gimp.org>2012-02-24 16:44:44 +0100
committerMichael Natterer <mitch@gimp.org>2012-02-24 16:44:44 +0100
commit8c1c4dfd7c49b7efefffb404ae7480453fe5f278 (patch)
treea1fe47327de32dca1d1b3142bc8cf16c471c6228 /gdk/gdkscreen.c
parent4a6658b0faf1ece6183dad8578af880badee98ba (diff)
downloadgtk+-8c1c4dfd7c49b7efefffb404ae7480453fe5f278.tar.gz
gdk: pull more precondition checks into the generic gdkscreen.c
Diffstat (limited to 'gdk/gdkscreen.c')
-rw-r--r--gdk/gdkscreen.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 0ed04b14c1..33e2ce983d 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -725,6 +725,7 @@ gdk_screen_get_monitor_width_mm (GdkScreen *screen,
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
g_return_val_if_fail (monitor_num >= 0, -1);
+ g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), -1);
return GDK_SCREEN_GET_CLASS (screen)->get_monitor_width_mm (screen, monitor_num);
}
@@ -746,6 +747,7 @@ gdk_screen_get_monitor_height_mm (GdkScreen *screen,
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
g_return_val_if_fail (monitor_num >= 0, -1);
+ g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), -1);
return GDK_SCREEN_GET_CLASS (screen)->get_monitor_height_mm (screen, monitor_num);
}
@@ -770,6 +772,7 @@ gdk_screen_get_monitor_plug_name (GdkScreen *screen,
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
g_return_val_if_fail (monitor_num >= 0, NULL);
+ g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), NULL);
return GDK_SCREEN_GET_CLASS (screen)->get_monitor_plug_name (screen, monitor_num);
}
@@ -799,6 +802,7 @@ gdk_screen_get_monitor_geometry (GdkScreen *screen,
{
g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (monitor_num >= 0);
+ g_return_if_fail (monitor_num < gdk_screen_get_n_monitors (screen));
GDK_SCREEN_GET_CLASS(screen)->get_monitor_geometry (screen, monitor_num, dest);
}
@@ -829,6 +833,7 @@ gdk_screen_get_monitor_workarea (GdkScreen *screen,
{
g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (monitor_num >= 0);
+ g_return_if_fail (monitor_num < gdk_screen_get_n_monitors (screen));
GDK_SCREEN_GET_CLASS (screen)->get_monitor_workarea (screen, monitor_num, dest);
}