summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/win32')
-rw-r--r--gdk/win32/gdkcolor-win32.c6
-rw-r--r--gdk/win32/gdkcursor-win32.c4
-rw-r--r--gdk/win32/gdkdisplay-win32.c2
-rw-r--r--gdk/win32/gdkdrawable-win32.c4
-rw-r--r--gdk/win32/gdkevents-win32.c22
-rw-r--r--gdk/win32/gdkfont-win32.c4
-rw-r--r--gdk/win32/gdkimage-win32.c6
-rw-r--r--gdk/win32/gdkinput-win32.h2
-rw-r--r--gdk/win32/gdkkeys-win32.c2
-rw-r--r--gdk/win32/gdkmain-win32.c2
-rw-r--r--gdk/win32/gdkpango-win32.c2
-rw-r--r--gdk/win32/gdkproperty-win32.c2
-rw-r--r--gdk/win32/gdkscreen-win32.c2
-rw-r--r--gdk/win32/gdkselection-win32.c10
-rw-r--r--gdk/win32/gdkvisual-win32.c4
-rw-r--r--gdk/win32/gdkwindow-win32.c4
16 files changed, 39 insertions, 39 deletions
diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index e5b9af66a7..9abc702184 100644
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -30,7 +30,7 @@
#include <string.h>
#include "gdkcolor.h"
-#include "gdkscreen.h" /* gdk_get_default_screen() */
+#include "gdkscreen.h" /* gdk_screen_get_default() */
#include "gdkinternals.h"
#include "gdkprivate-win32.h"
@@ -685,7 +685,7 @@ gdk_screen_get_system_colormap (GdkScreen *screen)
static GdkColormap *colormap = NULL;
GdkColormapPrivateWin32 *private;
- g_return_val_if_fail (screen == gdk_get_default_screen (), NULL);
+ g_return_val_if_fail (screen == gdk_screen_get_default (), NULL);
if (!colormap)
{
@@ -1393,6 +1393,6 @@ gdk_colormap_get_screen (GdkColormap *cmap)
{
g_return_val_if_fail (cmap != NULL, NULL);
- return gdk_get_default_screen ();
+ return gdk_screen_get_default ();
}
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index da3a93e1b5..723b9a3ede 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -91,7 +91,7 @@ gdk_cursor_new_for_display (GdkDisplay *display,
GdkCursor *cursor;
HCURSOR hcursor;
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
hcursor = _gdk_win32_data_to_wcursor (cursor_type);
@@ -310,5 +310,5 @@ _gdk_cursor_destroy (GdkCursor *cursor)
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
- return gdk_get_default_display ();
+ return gdk_display_get_default ();
}
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 0e9c4356ae..149361d20b 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -32,7 +32,7 @@ _gdk_windowing_set_default_display (GdkDisplay *display)
}
GdkDisplay *
-gdk_open_display (const gchar *display_name)
+gdk_display_open (const gchar *display_name)
{
if (_gdk_display != NULL)
return NULL; /* single display only */
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 95fcac3c22..f4d37b3d5c 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -31,7 +31,7 @@
#include <pango/pangowin32.h>
-#include "gdkscreen.h" /* gdk_get_default_screen() */
+#include "gdkscreen.h" /* gdk_screen_get_default() */
#include "gdkprivate-win32.h"
static void gdk_win32_draw_rectangle (GdkDrawable *drawable,
@@ -1451,7 +1451,7 @@ gdk_win32_get_depth (GdkDrawable *drawable)
static GdkScreen*
gdk_win32_get_screen (GdkDrawable *drawable)
{
- return gdk_get_default_screen ();
+ return gdk_screen_get_default ();
}
static GdkVisual*
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index ee5d74041c..ab86283a95 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -154,7 +154,7 @@ real_window_procedure (HWND hwnd,
LPARAM lparam)
{
/* any way to have more than one display on win32 ? */
- GdkDisplay *display = gdk_get_default_display ();
+ GdkDisplay *display = gdk_display_get_default ();
GdkEventPrivate event;
GdkEvent *eventp;
MSG msg;
@@ -389,7 +389,7 @@ gboolean
gdk_events_pending (void)
{
MSG msg;
- GdkDisplay *display = gdk_get_default_display ();
+ GdkDisplay *display = gdk_display_get_default ();
return (_gdk_event_queue_find_first (display) ||
PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
@@ -570,7 +570,7 @@ gdk_display_pointer_ungrab (GdkDisplay *display,
guint32 time)
{
GDK_NOTE (EVENTS, g_print ("gdk_pointer_ungrab\n"));
- g_return_if_fail (display == gdk_get_default_display ());
+ g_return_if_fail (display == gdk_display_get_default ());
#if 0
_gdk_input_ungrab_pointer (time);
@@ -644,7 +644,7 @@ find_window_for_pointer_event (GdkWindow* reported_window,
gboolean
gdk_display_pointer_is_grabbed (GdkDisplay *display)
{
- g_return_val_if_fail (display == gdk_get_default_display (), FALSE);
+ g_return_val_if_fail (display == gdk_display_get_default (), FALSE);
GDK_NOTE (EVENTS, g_print ("gdk_pointer_is_grabbed: %s\n",
p_grab_window != NULL ? "TRUE" : "FALSE"));
return p_grab_window != NULL;
@@ -655,7 +655,7 @@ gdk_pointer_grab_info_libgtk_only (GdkDisplay *display,
GdkWindow **grab_window,
gboolean *owner_events)
{
- g_return_val_if_fail (display == gdk_get_default_display (), FALSE);
+ g_return_val_if_fail (display == gdk_display_get_default (), FALSE);
if (p_grab_window != NULL)
{
@@ -721,7 +721,7 @@ void
gdk_display_keyboard_ungrab (GdkDisplay *display,
guint32 time)
{
- g_return_if_fail (display == gdk_get_default_display ());
+ g_return_if_fail (display == gdk_display_get_default ());
GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
@@ -745,7 +745,7 @@ gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
GdkWindow **grab_window,
gboolean *owner_events)
{
- g_return_val_if_fail (display == gdk_get_default_display (), FALSE);
+ g_return_val_if_fail (display == gdk_display_get_default (), FALSE);
if (k_grab_window)
{
@@ -3382,7 +3382,7 @@ gdk_event_prepare (GSource *source,
{
MSG msg;
gboolean retval;
- GdkDisplay *display = gdk_get_default_display ();
+ GdkDisplay *display = gdk_display_get_default ();
GDK_THREADS_ENTER ();
@@ -3401,7 +3401,7 @@ gdk_event_check (GSource *source)
{
MSG msg;
gboolean retval;
- GdkDisplay *display = gdk_get_default_display ();
+ GdkDisplay *display = gdk_display_get_default ();
GDK_THREADS_ENTER ();
@@ -3422,7 +3422,7 @@ gdk_event_dispatch (GSource *source,
gpointer user_data)
{
GdkEvent *event;
- GdkDisplay *display = gdk_get_default_display ();
+ GdkDisplay *display = gdk_display_get_default ();
GDK_THREADS_ENTER ();
@@ -3481,7 +3481,7 @@ gdk_display_sync (GdkDisplay * display)
{
MSG msg;
- g_return_if_fail (display == gdk_get_default_display ());
+ g_return_if_fail (display == gdk_display_get_default ());
/* Process all messages currently available */
while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 29639eff62..a831635eb8 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -1526,7 +1526,7 @@ gdk_font_load_for_display (GdkDisplay *display,
TEXTMETRIC textmetric;
g_return_val_if_fail (font_name != NULL, NULL);
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
font = gdk_font_hash_lookup (GDK_FONT_FONTSET, font_name);
if (font)
@@ -1582,7 +1582,7 @@ gdk_font_from_description_for_display (GdkDisplay *display,
GdkFont *result = NULL;
g_return_val_if_fail (font_desc != NULL, NULL);
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
font_map = pango_win32_font_map_for_display ();
font = pango_font_map_load_font (font_map, gdk_pango_context_get (), font_desc);
diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 026b158ba8..4741dc5434 100644
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -27,7 +27,7 @@
#include "gdkimage.h"
#include "gdkpixmap.h"
-#include "gdkscreen.h" /* gdk_get_default_screen() */
+#include "gdkscreen.h" /* gdk_screen_get_default() */
#include "gdkprivate-win32.h"
static GList *image_list = NULL;
@@ -208,7 +208,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
g_return_val_if_fail (!visual || GDK_IS_VISUAL (visual), NULL);
g_return_val_if_fail (visual || depth != -1, NULL);
- g_return_val_if_fail (screen == gdk_get_default_screen (), NULL);
+ g_return_val_if_fail (screen == gdk_screen_get_default (), NULL);
if (visual)
depth = visual->depth;
@@ -382,7 +382,7 @@ gint
_gdk_windowing_get_bits_for_depth (GdkDisplay *display,
gint depth)
{
- g_return_val_if_fail (display == gdk_get_default_display (), 0);
+ g_return_val_if_fail (display == gdk_display_get_default (), 0);
switch (depth)
{
diff --git a/gdk/win32/gdkinput-win32.h b/gdk/win32/gdkinput-win32.h
index ade066b00a..7ca2135e77 100644
--- a/gdk/win32/gdkinput-win32.h
+++ b/gdk/win32/gdkinput-win32.h
@@ -121,7 +121,7 @@ struct _GdkInputWindow
/* Global data */
-#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == gdk_get_default_display ()->core_pointer)
+#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == gdk_display_get_default ()->core_pointer)
extern GList *_gdk_input_devices;
extern GList *_gdk_input_windows;
diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index bd2f7adecc..e96b464a90 100644
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -289,7 +289,7 @@ update_keymap (void)
GdkKeymap*
gdk_keymap_get_for_display (GdkDisplay *display)
{
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
if (default_keymap == NULL)
default_keymap = g_object_new (gdk_keymap_get_type (), NULL);
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index a08915a9ed..eb09f05b58 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -188,7 +188,7 @@ gdk_set_sm_client_id (const gchar* sm_client_id)
void
gdk_display_beep (GdkDisplay *display)
{
- g_return_if_fail (display == gdk_get_default_display());
+ g_return_if_fail (display == gdk_display_get_default());
Beep(1000, 50);
}
diff --git a/gdk/win32/gdkpango-win32.c b/gdk/win32/gdkpango-win32.c
index e209721adf..26271cd36e 100644
--- a/gdk/win32/gdkpango-win32.c
+++ b/gdk/win32/gdkpango-win32.c
@@ -25,7 +25,7 @@
PangoContext *
gdk_pango_context_get_for_screen (GdkScreen *screen)
{
- g_return_val_if_fail (screen == gdk_get_default_screen (), NULL);
+ g_return_val_if_fail (screen == gdk_screen_get_default (), NULL);
return pango_win32_get_context ();
}
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index f25130a205..3fce0f48ba 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -486,7 +486,7 @@ gdk_screen_get_setting (GdkScreen *screen,
const gchar *name,
GValue *value)
{
- g_return_val_if_fail (screen == gdk_get_default_screen (), FALSE);
+ g_return_val_if_fail (screen == gdk_screen_get_default (), FALSE);
/*
* XXX : if these values get changed through the Windoze UI the
diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index fc0eb5f867..f5e8074ba4 100644
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -26,7 +26,7 @@ static GdkColormap *default_colormap = NULL;
GdkDisplay *
gdk_screen_get_display (GdkScreen *screen)
{
- return gdk_get_default_display ();
+ return gdk_display_get_default ();
}
gint
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index bf5269a961..d6b9d82eee 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -119,7 +119,7 @@ gdk_selection_owner_set_for_display (GdkDisplay *display,
GdkEvent tmp_event;
gchar *sel_name;
- g_return_val_if_fail (display == gdk_get_default_display (), FALSE);
+ g_return_val_if_fail (display == gdk_display_get_default (), FALSE);
GDK_NOTE (DND,
(sel_name = gdk_atom_name (selection),
@@ -199,7 +199,7 @@ gdk_selection_owner_get_for_display (GdkDisplay *display,
GdkWindow *window;
gchar *sel_name;
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
/* Return NULL for CLIPBOARD, because otherwise cut&paste
* inside the same application doesn't work. We must pretend to gtk
@@ -516,7 +516,7 @@ gdk_selection_send_notify_for_display (GdkDisplay *display,
GdkEvent tmp_event;
gchar *sel_name, *tgt_name, *prop_name;
- g_return_if_fail (display == gdk_get_default_display ());
+ g_return_if_fail (display == gdk_display_get_default ());
GDK_NOTE (DND,
(sel_name = gdk_atom_name (selection),
@@ -722,7 +722,7 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay *display,
{
g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (length >= 0, 0);
- g_return_val_if_fail (display == gdk_get_default_display (), 0);
+ g_return_val_if_fail (display == gdk_display_get_default (), 0);
if (encoding == GDK_TARGET_STRING)
{
@@ -882,7 +882,7 @@ gdk_utf8_to_compound_text_for_display (GdkDisplay *display,
gboolean result;
g_return_val_if_fail (str != NULL, FALSE);
- g_return_val_if_fail (display == gdk_get_default_display (), FALSE);
+ g_return_val_if_fail (display == gdk_display_get_default (), FALSE);
need_conversion = !g_get_charset (&charset);
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index 917e961140..c1a09e77ac 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include "gdkvisual.h"
-#include "gdkscreen.h" /* gdk_get_default_screen() */
+#include "gdkscreen.h" /* gdk_screen_get_default() */
#include "gdkprivate-win32.h"
static void gdk_visual_decompose_mask (gulong mask,
@@ -369,7 +369,7 @@ gdk_visual_get_screen (GdkVisual *visual)
{
g_return_val_if_fail (GDK_IS_VISUAL (visual), NULL);
- return gdk_get_default_screen ();
+ return gdk_screen_get_default ();
}
static void
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index b5159f3070..32f7b607b9 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -683,7 +683,7 @@ gdk_window_foreign_new_for_display (GdkDisplay *display,
RECT rect;
POINT point;
- g_return_val_if_fail (display == gdk_get_default_display (), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default (), NULL);
window = g_object_new (GDK_TYPE_WINDOW, NULL);
private = (GdkWindowObject *)window;
@@ -2618,7 +2618,7 @@ gdk_window_begin_move_drag (GdkWindow *window,
GdkWindow *
gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
{
- g_return_val_if_fail (display == gdk_get_default_display(), NULL);
+ g_return_val_if_fail (display == gdk_display_get_default(), NULL);
return gdk_window_lookup (anid);
}
View Lorry Controller Status