callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GdkScreen: fix precondition checks in the public API

Browse Source 
Move g_return_if_fail() stuff from the backends to the public
functions in gdkscreen.c itself, and some fixes for ugly formatting in
the various gdkscreen-backend.c files.
This commit is contained in:
Michael Natterer
2012-02-21 17:19:35 +01:00
parent 8317fed2b9
commit 427b88f541
6 changed files with 99 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gdk/win32/gdkscreen-win32.c
View File

@ -27,13 +27,16 @@ struct _GdkWin32Screen
{
GdkScreen parent_instance;
};
struct _GdkWin32ScreenClass
{
GdkScreenClass parent_class;
};
G_DEFINE_TYPE (GdkWin32Screen, gdk_win32_screen, GDK_TYPE_SCREEN)
static void
gdk_win32_screen_init(GdkWin32Screen *display)
gdk_win32_screen_init (GdkWin32Screen *display)
{
}
@ -91,45 +94,41 @@ gdk_win32_screen_get_primary_monitor (GdkScreen *screen)
static gint
gdk_win32_screen_get_monitor_width_mm (GdkScreen *screen,
gint num_monitor)
gint num_monitor)
{
g_return_val_if_fail (screen == _gdk_screen, 0);
g_return_val_if_fail (num_monitor < _gdk_num_monitors, 0);
g_return_val_if_fail (num_monitor >= 0, 0);
return _gdk_monitors[num_monitor].width_mm;
}
static gint
gdk_win32_screen_get_monitor_height_mm (GdkScreen *screen,
gint num_monitor)
gint num_monitor)
{
g_return_val_if_fail (screen == _gdk_screen, 0);
g_return_val_if_fail (num_monitor < _gdk_num_monitors, 0);
g_return_val_if_fail (num_monitor >= 0, 0);
return _gdk_monitors[num_monitor].height_mm;
}
static gchar *
gdk_win32_screen_get_monitor_plug_name (GdkScreen *screen,
gint num_monitor)
gint num_monitor)
{
g_return_val_if_fail (screen == _gdk_screen, 0);
g_return_val_if_fail (num_monitor < _gdk_num_monitors, 0);
g_return_val_if_fail (num_monitor >= 0, 0);
return g_strdup (_gdk_monitors[num_monitor].name);
}
static void
gdk_win32_screen_get_monitor_geometry (GdkScreen *screen,
gint num_monitor,
GdkRectangle *dest)
gdk_win32_screen_get_monitor_geometry (GdkScreen *screen,
gint num_monitor,
GdkRectangle *dest)
{
g_return_if_fail (screen == _gdk_screen);
g_return_if_fail (num_monitor < _gdk_num_monitors);
g_return_if_fail (num_monitor >= 0);
*dest = _gdk_monitors[num_monitor].rect;
}
@ -141,16 +140,16 @@ gdk_win32_screen_get_rgba_visual (GdkScreen *screen)
return NULL;
}
static gint
gdk_win32_screen_get_number (GdkScreen *screen)
{
g_return_val_if_fail (screen == _gdk_screen, 0);
g_return_val_if_fail (screen == _gdk_screen, 0);
return 0;
}
gchar *
gchar *
_gdk_windowing_substitute_screen_number (const gchar *display_name,
int screen_number)
{