summaryrefslogtreecommitdiff
path: root/gdk/win32
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/win32')
-rw-r--r--gdk/win32/bdfcursor.c24
-rw-r--r--gdk/win32/gdkclipdrop-win32.c56
-rw-r--r--gdk/win32/gdkclipdrop-win32.h10
-rw-r--r--gdk/win32/gdkcursor-win32.c44
-rw-r--r--gdk/win32/gdkdevicemanager-win32.c2
-rw-r--r--gdk/win32/gdkdisplay-win32.c12
-rw-r--r--gdk/win32/gdkdisplay-win32.h2
-rw-r--r--gdk/win32/gdkdrag-win32.c2
-rw-r--r--gdk/win32/gdkdrop-win32.c12
-rw-r--r--gdk/win32/gdkevents-win32.c2
-rw-r--r--gdk/win32/gdkmain-win32.c100
-rw-r--r--gdk/win32/gdkmonitor-win32.c18
-rw-r--r--gdk/win32/gdkmonitor-win32.h2
-rw-r--r--gdk/win32/gdkprivate-win32.h62
-rw-r--r--gdk/win32/gdkproperty-win32.c8
-rw-r--r--gdk/win32/gdksurface-win32.c14
-rw-r--r--gdk/win32/gdkwin32display.h2
-rw-r--r--gdk/win32/xcursors.h2
18 files changed, 187 insertions, 187 deletions
diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c
index 7c091a1626..8eb8e0ec76 100644
--- a/gdk/win32/bdfcursor.c
+++ b/gdk/win32/bdfcursor.c
@@ -25,21 +25,21 @@
#include <glib.h>
typedef struct {
- gchar *name;
+ char *name;
int id;
- gchar *bitmap;
+ char *bitmap;
int hotx;
int hoty;
} font_info_t;
typedef struct {
- gchar *name;
+ char *name;
int id;
int width;
int height;
int hotx;
int hoty;
- gchar *data;
+ char *data;
} cursor_info_t;
static GSList *fonts = NULL;
@@ -98,13 +98,13 @@ cursor_info_t *ci;
}
static int read_bdf_font(fname)
-gchar *fname;
+char *fname;
{
FILE *f;
- gchar line[2048];
+ char line[2048];
int rv = 0;
gboolean startchar = FALSE, startbitmap = FALSE;
- gchar *charname,*p,*bitmap;
+ char *charname,*p,*bitmap;
int dx = 0,dy = 0;
int w,h,x,y,py;
int id,tmp;
@@ -280,7 +280,7 @@ static void compose_cursors_from_fonts()
for (l = g_slist_copy (fonts); l; l = g_slist_delete_link (l,l))
{
font_info_t *fi = l->data;
- gchar *name;
+ char *name;
GSList *ml;
name = g_strconcat(fi->name, "_mask", NULL);
@@ -301,8 +301,8 @@ static char *dump_cursor(ci, id)
cursor_info_t *ci;
int id;
{
- static gchar cdata[8192];
- gchar *p;
+ static char cdata[8192];
+ char *p;
int i;
int c;
gboolean flushed;
@@ -351,7 +351,7 @@ static int dump_cursors()
GSList *ptr;
FILE *f = stdout;
- fprintf(f, "static const struct { const gchar *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
+ fprintf(f, "static const struct { const char *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
for (ptr = cursors; ptr; ptr = ptr->next)
{
@@ -367,7 +367,7 @@ static int dump_cursors()
int main(argc, argv)
int argc;
-gchar **argv;
+char **argv;
{
if (argc != 2)
{
diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 65e4fdb0d9..4a7fac2bd2 100644
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -297,7 +297,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
#define CLIPBOARD_RENDER_TIMEOUT (G_USEC_PER_SEC * 29)
gboolean _gdk_win32_transmute_windows_data (UINT from_w32format,
- const gchar *to_contentformat,
+ const char *to_contentformat,
HANDLE hdata,
guchar **set_data,
gsize *set_data_length);
@@ -347,7 +347,7 @@ typedef struct _GdkWin32ClipboardStorePrepElement GdkWin32ClipboardStorePrepElem
struct _GdkWin32ClipboardStorePrepElement
{
UINT w32format;
- const gchar *contentformat;
+ const char *contentformat;
HANDLE handle;
GOutputStream *stream;
};
@@ -889,7 +889,7 @@ grab_data_from_hdata (GdkWin32ClipboardThreadRetrieve *retr,
if (data == NULL)
{
- gchar *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
+ char *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
send_response (retr->parent.item_type,
retr->parent.opaque_task,
g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -1609,22 +1609,22 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
win32_clipdrop->n_known_pixbuf_formats = 0;
for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
{
- gchar **mime_types =
+ char **mime_types =
gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
- gchar **mime_type;
+ char **mime_type;
for (mime_type = mime_types; *mime_type != NULL; mime_type++)
win32_clipdrop->n_known_pixbuf_formats++;
}
- win32_clipdrop->known_pixbuf_formats = g_new (const gchar *, win32_clipdrop->n_known_pixbuf_formats);
+ win32_clipdrop->known_pixbuf_formats = g_new (const char *, win32_clipdrop->n_known_pixbuf_formats);
i = 0;
for (rover = pixbuf_formats; rover != NULL; rover = rover->next)
{
- gchar **mime_types =
+ char **mime_types =
gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) rover->data);
- gchar **mime_type;
+ char **mime_type;
for (mime_type = mime_types; *mime_type != NULL; mime_type++)
win32_clipdrop->known_pixbuf_formats[i++] = g_intern_string (*mime_type);
@@ -1840,7 +1840,7 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
#define CLIPBOARD_IDLE_ABORT_TIME 30
-static const gchar *
+static const char *
predefined_name (UINT fmt)
{
#define CASE(fmt) case fmt: return #fmt
@@ -1876,15 +1876,15 @@ predefined_name (UINT fmt)
}
}
-gchar *
+char *
_gdk_win32_get_clipboard_format_name (UINT fmt,
gboolean *is_predefined)
{
int registered_name_w_len = 1024;
wchar_t *registered_name_w = g_malloc (registered_name_w_len);
- gchar *registered_name = NULL;
+ char *registered_name = NULL;
int gcfn_result;
- const gchar *predef = predefined_name (fmt);
+ const char *predef = predefined_name (fmt);
/* TODO: cache the result in a hash table */
@@ -1934,13 +1934,13 @@ _gdk_win32_get_clipboard_format_name (UINT fmt,
* Does nothing for strings that already look like a mime/type
* (no spaces, one slash, with at least one char on each side of the slash).
*/
-const gchar *
-_gdk_win32_get_clipboard_format_name_as_interned_mimetype (gchar *w32format_name)
+const char *
+_gdk_win32_get_clipboard_format_name_as_interned_mimetype (char *w32format_name)
{
- gchar *mime_type;
- const gchar *result;
- gchar *space = strchr (w32format_name, ' ');
- gchar *slash = strchr (w32format_name, '/');
+ char *mime_type;
+ const char *result;
+ char *space = strchr (w32format_name, ' ');
+ char *slash = strchr (w32format_name, '/');
if (space == NULL &&
slash > w32format_name &&
@@ -1956,7 +1956,7 @@ _gdk_win32_get_clipboard_format_name_as_interned_mimetype (gchar *w32format_name
}
static GArray *
-get_compatibility_w32formats_for_contentformat (const gchar *contentformat)
+get_compatibility_w32formats_for_contentformat (const char *contentformat)
{
GArray *result = NULL;
int i;
@@ -2017,8 +2017,8 @@ _gdk_win32_add_w32format_to_pairs (UINT w32format,
GdkContentFormatsBuilder *builder)
{
gboolean predef;
- gchar *w32format_name = _gdk_win32_get_clipboard_format_name (w32format, &predef);
- const gchar *interned_w32format_name;
+ char *w32format_name = _gdk_win32_get_clipboard_format_name (w32format, &predef);
+ const char *interned_w32format_name;
GdkWin32ContentFormatPair pair;
GArray *comp_pairs;
int i, j;
@@ -2079,7 +2079,7 @@ transmute_cf_unicodetext_to_utf8_string (const guchar *data,
GDestroyNotify *set_data_destroy)
{
wchar_t *ptr, *p, *q;
- gchar *result;
+ char *result;
glong wclen, u8_len;
/* Strip out \r */
@@ -2280,12 +2280,12 @@ transmute_cf_text_to_utf8_string (const guchar *data,
GDestroyNotify *set_data_destroy)
{
char *ptr, *p, *q;
- gchar *result;
+ char *result;
glong wclen, u8_len;
wchar_t *wstr;
/* Strip out \r */
- ptr = (gchar *) data;
+ ptr = (char *) data;
p = ptr;
q = ptr;
wclen = 0;
@@ -2509,11 +2509,11 @@ transmute_cf_shell_id_list_to_text_uri_list (const guchar *data,
if (SHGetPathFromIDListW (file_id_full, path_w))
{
- gchar *filename = g_utf16_to_utf8 (path_w, -1, NULL, NULL, NULL);
+ char *filename = g_utf16_to_utf8 (path_w, -1, NULL, NULL, NULL);
if (filename)
{
- gchar *uri = g_filename_to_uri (filename, NULL, NULL);
+ char *uri = g_filename_to_uri (filename, NULL, NULL);
if (uri)
{
@@ -2566,7 +2566,7 @@ transmute_image_bmp_to_cf_dib (const guchar *data,
gboolean
_gdk_win32_transmute_windows_data (UINT from_w32format,
- const gchar *to_contentformat,
+ const char *to_contentformat,
HANDLE hdata,
guchar **set_data,
gsize *set_data_length)
@@ -2627,7 +2627,7 @@ _gdk_win32_transmute_windows_data (UINT from_w32format,
}
gboolean
-_gdk_win32_transmute_contentformat (const gchar *from_contentformat,
+_gdk_win32_transmute_contentformat (const char *from_contentformat,
UINT to_w32format,
const guchar *data,
int length,
diff --git a/gdk/win32/gdkclipdrop-win32.h b/gdk/win32/gdkclipdrop-win32.h
index f28b0eec80..6d37e9e367 100644
--- a/gdk/win32/gdkclipdrop-win32.h
+++ b/gdk/win32/gdkclipdrop-win32.h
@@ -38,7 +38,7 @@ typedef struct {
/* This is assumed to be an interned string, it will be
* compared by simply comparing the pointer.
*/
- const gchar *contentformat;
+ const char *contentformat;
gboolean transmute;
} GdkWin32ContentFormatPair;
@@ -129,7 +129,7 @@ struct _GdkWin32Clipdrop
GObject *parent_instance;
/* interned strings for well-known image formats */
- const gchar **known_pixbuf_formats;
+ const char **known_pixbuf_formats;
int n_known_pixbuf_formats;
/* GArray of GdkAtoms for various known Selection and DnD strings.
@@ -238,7 +238,7 @@ void _gdk_win32_clipdrop_init (void);
gboolean _gdk_win32_format_uses_hdata (UINT w32format);
-gchar * _gdk_win32_get_clipboard_format_name (UINT fmt,
+char * _gdk_win32_get_clipboard_format_name (UINT fmt,
gboolean *is_predefined);
void _gdk_win32_add_w32format_to_pairs (UINT format,
GArray *array,
@@ -249,7 +249,7 @@ int _gdk_win32_add_contentformat_to_pairs (const char
void _gdk_win32_clipboard_default_output_done (GObject *clipboard,
GAsyncResult *result,
gpointer user_data);
-gboolean _gdk_win32_transmute_contentformat (const gchar *from_contentformat,
+gboolean _gdk_win32_transmute_contentformat (const char *from_contentformat,
UINT to_w32format,
const guchar *data,
int length,
@@ -257,7 +257,7 @@ gboolean _gdk_win32_transmute_contentformat (const gchar
gsize *set_data_length);
gboolean _gdk_win32_transmute_windows_data (UINT from_w32format,
- const gchar *to_contentformat,
+ const char *to_contentformat,
HANDLE hdata,
guchar **set_data,
gsize *set_data_length);
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 9184e6bcd3..9bfdd2c443 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -382,7 +382,7 @@ gdk_win32_hcursor_get_handle (GdkWin32HCursor *cursor)
static HCURSOR
hcursor_from_x_cursor (int i,
- const gchar *name)
+ const char *name)
{
int j, x, y, ofs;
HCURSOR rv;
@@ -448,7 +448,7 @@ hcursor_from_x_cursor (int i,
static GdkWin32HCursor *
win32_cursor_create_win32hcursor (GdkWin32Display *display,
Win32Cursor *cursor,
- const gchar *name)
+ const char *name)
{
GdkWin32HCursor *result;
@@ -467,7 +467,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_NULL:
result = gdk_win32_hcursor_new (display,
LoadImageA (NULL,
- (const gchar *) cursor->resource_name,
+ (const char *) cursor->resource_name,
IMAGE_CURSOR,
cursor->width,
cursor->height,
@@ -477,7 +477,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_THIS:
result = gdk_win32_hcursor_new (display,
LoadImageA (_gdk_app_hmodule,
- (const gchar *) cursor->resource_name,
+ (const char *) cursor->resource_name,
IMAGE_CURSOR,
cursor->width,
cursor->height,
@@ -487,7 +487,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_GTK:
result = gdk_win32_hcursor_new (display,
LoadImageA (_gdk_dll_hinstance,
- (const gchar *) cursor->resource_name,
+ (const char *) cursor->resource_name,
IMAGE_CURSOR,
cursor->width,
cursor->height,
@@ -546,10 +546,10 @@ win32_cursor_destroy (gpointer data)
static void
win32_cursor_theme_load_from (Win32CursorTheme *theme,
int size,
- const gchar *dir)
+ const char *dir)
{
GDir *gdir;
- const gchar *filename;
+ const char *filename;
HCURSOR hcursor;
gdir = g_dir_open (dir, 0, NULL);
@@ -559,10 +559,10 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme,
while ((filename = g_dir_read_name (gdir)) != NULL)
{
- gchar *fullname;
+ char *fullname;
gunichar2 *filenamew;
- gchar *cursor_name;
- gchar *dot;
+ char *cursor_name;
+ char *dot;
Win32Cursor *cursor;
fullname = g_build_filename (dir, filename, NULL);
@@ -599,11 +599,11 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme,
static void
win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme,
- const gchar *name,
+ const char *name,
int size)
{
- gchar *theme_dir;
- const gchar * const *dirs;
+ char *theme_dir;
+ const char * const *dirs;
int i;
dirs = g_get_system_data_dirs ();
@@ -689,7 +689,7 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,
}
Win32CursorTheme *
-win32_cursor_theme_load (const gchar *name,
+win32_cursor_theme_load (const char *name,
int size)
{
Win32CursorTheme *result = g_new0 (Win32CursorTheme, 1);
@@ -725,7 +725,7 @@ win32_cursor_theme_destroy (Win32CursorTheme *theme)
Win32Cursor *
win32_cursor_theme_get_cursor (Win32CursorTheme *theme,
- const gchar *name)
+ const char *name)
{
return g_hash_table_lookup (theme->named_cursors, name);
}
@@ -779,7 +779,7 @@ _gdk_win32_display_init_cursors (GdkWin32Display *display)
/* This is where we use the names mapped to the equivalents that Windows defines by default */
static GdkWin32HCursor *
win32hcursor_idc_from_name (GdkWin32Display *display,
- const gchar *name)
+ const char *name)
{
int i;
@@ -799,7 +799,7 @@ win32hcursor_idc_from_name (GdkWin32Display *display,
static GdkWin32HCursor *
win32hcursor_x_from_name (GdkWin32Display *display,
- const gchar *name)
+ const char *name)
{
int i;
@@ -812,7 +812,7 @@ win32hcursor_x_from_name (GdkWin32Display *display,
static GdkWin32HCursor *
win32hcursor_from_theme (GdkWin32Display *display,
- const gchar *name)
+ const char *name)
{
Win32CursorTheme *theme;
Win32Cursor *theme_cursor;
@@ -832,7 +832,7 @@ win32hcursor_from_theme (GdkWin32Display *display,
static GdkWin32HCursor *
win32hcursor_from_name (GdkWin32Display *display,
- const gchar *name)
+ const char *name)
{
GdkWin32HCursor *win32hcursor;
@@ -879,7 +879,7 @@ create_blank_win32hcursor (GdkWin32Display *display)
static GdkWin32HCursor *
gdk_win32hcursor_create_for_name (GdkWin32Display *display,
- const gchar *name)
+ const char *name)
{
GdkWin32HCursor *win32hcursor = NULL;
@@ -940,7 +940,7 @@ _gdk_win32_cursor_update (GdkWin32Display *win32_display,
Win32CursorTheme *theme;
Win32Cursor *theme_cursor;
- const gchar *name = gdk_cursor_get_name (cursor);
+ const char *name = gdk_cursor_get_name (cursor);
/* Do nothing if this is not a named cursor. */
if (name == NULL)
@@ -1509,7 +1509,7 @@ gdk_win32_display_get_win32hcursor (GdkWin32Display *display,
{
GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
GdkWin32HCursor *win32hcursor;
- const gchar *cursor_name;
+ const char *cursor_name;
GdkCursor *fallback;
g_return_val_if_fail (cursor != NULL, NULL);
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index a2d26b0231..df456c29fd 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -360,7 +360,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
UINT devix, cursorix;
int i, num_axes = 0;
wchar_t devname[100], csrname[100];
- gchar *devname_utf8, *csrname_utf8, *device_name;
+ char *devname_utf8, *csrname_utf8, *device_name;
BOOL defcontext_done;
HMODULE wintab32;
char *wintab32_dll_path;
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 53227c70ff..27e094d535 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -339,7 +339,7 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
*/
void
gdk_win32_display_set_cursor_theme (GdkDisplay *display,
- const gchar *name,
+ const char *name,
int size)
{
int cursor_size;
@@ -492,7 +492,7 @@ register_display_change_notification (GdkDisplay *display)
}
GdkDisplay *
-_gdk_win32_display_open (const gchar *display_name)
+_gdk_win32_display_open (const char *display_name)
{
GdkWin32Display *win32_display;
@@ -548,7 +548,7 @@ _gdk_win32_display_open (const gchar *display_name)
G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
-static const gchar *
+static const char *
gdk_win32_display_get_name (GdkDisplay *display)
{
HDESK hdesk = GetThreadDesktop (GetCurrentThreadId ());
@@ -882,7 +882,7 @@ _gdk_win32_enable_hidpi (GdkWin32Display *display)
static void
gdk_win32_display_init (GdkWin32Display *display)
{
- const gchar *scale_str = g_getenv ("GDK_SCALE");
+ const char *scale_str = g_getenv ("GDK_SCALE");
display->monitors = G_LIST_MODEL (g_list_store_new (GDK_TYPE_MONITOR));
@@ -927,7 +927,7 @@ gdk_win32_display_check_composited (GdkWin32Display *display)
static void
gdk_win32_display_notify_startup_complete (GdkDisplay *display,
- const gchar *startup_id)
+ const char *startup_id)
{
/* nothing */
}
@@ -1038,7 +1038,7 @@ _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
static gboolean
gdk_win32_display_get_setting (GdkDisplay *display,
- const gchar *name,
+ const char *name,
GValue *value)
{
return _gdk_win32_get_setting (name, value);
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 02c217189f..bbb96fe255 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -72,7 +72,7 @@ struct _GdkWin32Display
GdkWin32Screen *screen;
Win32CursorTheme *cursor_theme;
- gchar *cursor_theme_name;
+ char *cursor_theme_name;
int cursor_theme_size;
HWND hwnd;
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 20f8cb3f4b..8d6caa9ae3 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -2255,7 +2255,7 @@ gdk_win32_drag_cancel (GdkDrag *drag,
{
GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
- const gchar *reason_str = NULL;
+ const char *reason_str = NULL;
switch (reason)
{
case GDK_DRAG_CANCEL_NO_TARGET:
diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index 8d0ba39431..aecb5d8eed 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -95,7 +95,7 @@ struct _GdkWin32Drop
/* The list from WM_DROPFILES is store here temporarily,
* until the next gdk_win32_drop_read_async ()
*/
- gchar *dropfiles_list;
+ char *dropfiles_list;
guint drop_finished : 1; /* FALSE until gdk_drop_finish() is called */
guint drop_failed : 1; /* Whether the drop was unsuccessful */
@@ -316,7 +316,7 @@ query_object_formats (LPDATAOBJECT pDataObj,
while (SUCCEEDED (hr) && hr != S_FALSE)
{
gboolean is_predef;
- gchar *registered_name = _gdk_win32_get_clipboard_format_name (fmt.cfFormat, &is_predef);
+ char *registered_name = _gdk_win32_get_clipboard_format_name (fmt.cfFormat, &is_predef);
if (registered_name && is_predef)
GDK_NOTE (DND, g_print ("supported built-in source format 0x%x %s\n", fmt.cfFormat, registered_name));
@@ -817,7 +817,7 @@ target_context_new (GdkSurface *window)
static gboolean
resolve_link (HWND hWnd,
wchar_t *link,
- gchar **lpszPath)
+ char **lpszPath)
{
WIN32_FILE_ATTRIBUTE_DATA wfad;
HRESULT hr;
@@ -940,7 +940,7 @@ gdk_dropfiles_filter (GdkWin32Display *display,
HANDLE hdrop;
POINT pt;
int nfiles, i;
- gchar *fileName, *linkedFile;
+ char *fileName, *linkedFile;
if (msg->message != WM_DROPFILES)
return GDK_WIN32_MESSAGE_FILTER_CONTINUE;
@@ -972,7 +972,7 @@ gdk_dropfiles_filter (GdkWin32Display *display,
result = g_string_new (NULL);
for (i = 0; i < nfiles; i++)
{
- gchar *uri;
+ char *uri;
wchar_t wfn[MAX_PATH];
DragQueryFileW (hdrop, i, wfn, MAX_PATH);
@@ -1225,7 +1225,7 @@ grab_data_from_hdata (GTask *task,
if (data == NULL)
{
- gchar *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
+ char *length_str = g_strdup_printf ("%" G_GSIZE_FORMAT, length);
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Cannot get DnD data. Failed to allocate %s bytes to store the data."), length_str);
g_free (length_str);
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 0802fabdd3..a2ff0d952e 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2038,7 +2038,7 @@ gdk_event_translate (MSG *msg,
int button;
- gchar buf[256];
+ char buf[256];
gboolean return_val = FALSE;
int i;
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index ea71f046b3..73fd620ac1 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -52,7 +52,7 @@ static gboolean gdk_synchronize = FALSE;
void
_gdk_win32_surfaceing_init (void)
{
- gchar buf[10];
+ char buf[10];
if (getenv ("GDK_IGNORE_WINTAB") != NULL)
_gdk_input_ignore_wintab = TRUE;
@@ -77,18 +77,18 @@ _gdk_win32_surfaceing_init (void)
}
void
-_gdk_win32_api_failed (const gchar *where,
- const gchar *api)
+_gdk_win32_api_failed (const char *where,
+ const char *api)
{
DWORD error_code = GetLastError ();
- gchar *msg = g_win32_error_message (error_code);
+ char *msg = g_win32_error_message (error_code);
g_warning ("%s: %s failed with code %lu: %s", where, api, error_code, msg);
g_free (msg);
}
void
-_gdk_other_api_failed (const gchar *where,
- const gchar *api)
+_gdk_other_api_failed (const char *where,
+ const char *api)
{
g_warning ("%s: %s failed", where, api);
}
@@ -104,14 +104,14 @@ _gdk_other_api_failed (const gchar *where,
* function’s return value is used in debugging output right after the call,
* and the return value isn’t used after that.
*/
-static gchar *
-static_printf (const gchar *format,
+static char *
+static_printf (const char *format,
...)
{
- static gchar buf[10000];
- gchar *msg;
- static gchar *bufp = buf;
- gchar *retval;
+ static char buf[10000];
+ char *msg;
+ static char *bufp = buf;
+ char *retval;
va_list args;
va_start (args, format);
@@ -244,7 +244,7 @@ _gdk_win32_print_dc (HDC hdc)
DeleteObject (hrgn);
}
-gchar *
+char *
_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
{
switch (protocol)
@@ -261,12 +261,12 @@ _gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
return NULL;
}
-gchar *
+char *
_gdk_win32_surface_state_to_string (GdkSurfaceState state)
{
- gchar buf[100];
- gchar *bufp = buf;
- gchar *s = "";
+ char buf[100];
+ char *bufp = buf;
+ char *s = "";
buf[0] = '\0';
@@ -287,12 +287,12 @@ _gdk_win32_surface_state_to_string (GdkSurfaceState state)
return static_printf ("%s", buf);
}
-gchar *
+char *
_gdk_win32_surface_style_to_string (LONG style)
{
- gchar buf[1000];
- gchar *bufp = buf;
- gchar *s = "";
+ char buf[1000];
+ char *bufp = buf;
+ char *s = "";
buf[0] = '\0';
@@ -329,12 +329,12 @@ _gdk_win32_surface_style_to_string (LONG style)
return static_printf ("%s", buf);
}
-gchar *
+char *
_gdk_win32_surface_exstyle_to_string (LONG style)
{
- gchar buf[1000];
- gchar *bufp = buf;
- gchar *s = "";
+ char buf[1000];
+ char *bufp = buf;
+ char *s = "";
buf[0] = '\0';
@@ -375,12 +375,12 @@ _gdk_win32_surface_exstyle_to_string (LONG style)
return static_printf ("%s", buf);
}
-gchar *
+char *
_gdk_win32_surface_pos_bits_to_string (UINT flags)
{
- gchar buf[1000];
- gchar *bufp = buf;
- gchar *s = "";
+ char buf[1000];
+ char *bufp = buf;
+ char *s = "";
buf[0] = '\0';
@@ -407,12 +407,12 @@ _gdk_win32_surface_pos_bits_to_string (UINT flags)
return static_printf ("%s", buf);
}
-gchar *
+char *
_gdk_win32_drag_action_to_string (GdkDragAction actions)
{
- gchar buf[100];
- gchar *bufp = buf;
- gchar *s = "";
+ char buf[100];
+ char *bufp = buf;
+ char *s = "";
buf[0] = '\0';
@@ -429,7 +429,7 @@ _gdk_win32_drag_action_to_string (GdkDragAction actions)
return static_printf ("%s", buf);
}
-gchar *
+char *
_gdk_win32_rop2_to_string (int rop2)
{
switch (rop2)
@@ -458,7 +458,7 @@ _gdk_win32_rop2_to_string (int rop2)
return NULL;
}
-gchar *
+char *
_gdk_win32_lbstyle_to_string (UINT brush_style)
{
switch (brush_style)
@@ -477,7 +477,7 @@ _gdk_win32_lbstyle_to_string (UINT brush_style)
return NULL;
}
-gchar *
+char *
_gdk_win32_pstype_to_string (DWORD pen_style)
{
switch (pen_style & PS_TYPE_MASK)
@@ -490,7 +490,7 @@ _gdk_win32_pstype_to_string (DWORD pen_style)
return NULL;
}
-gchar *
+char *
_gdk_win32_psstyle_to_string (DWORD pen_style)
{
switch (pen_style & PS_STYLE_MASK)
@@ -512,7 +512,7 @@ _gdk_win32_psstyle_to_string (DWORD pen_style)
return NULL;
}
-gchar *
+char *
_gdk_win32_psendcap_to_string (DWORD pen_style)
{
switch (pen_style & PS_ENDCAP_MASK)
@@ -528,7 +528,7 @@ _gdk_win32_psendcap_to_string (DWORD pen_style)
return NULL;
}
-gchar *
+char *
_gdk_win32_psjoin_to_string (DWORD pen_style)
{
switch (pen_style & PS_JOIN_MASK)
@@ -544,7 +544,7 @@ _gdk_win32_psjoin_to_string (DWORD pen_style)
return NULL;
}
-gchar *
+char *
_gdk_win32_message_to_string (UINT msg)
{
switch (msg)
@@ -781,16 +781,16 @@ _gdk_win32_message_to_string (UINT msg)
return NULL;
}
-gchar *
+char *
_gdk_win32_key_to_string (LONG lParam)
{
char buf[100];
- gchar *keyname_utf8;
+ char *keyname_utf8;
if (GetKeyNameText (lParam, buf, sizeof (buf)) &&
(keyname_utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL)) != NULL)
{
- gchar *retval = static_printf ("%s", keyname_utf8);
+ char *retval = static_printf ("%s", keyname_utf8);
g_free (keyname_utf8);
@@ -800,7 +800,7 @@ _gdk_win32_key_to_string (LONG lParam)
return static_printf ("unk-%#lx", lParam);
}
-gchar *
+char *
_gdk_win32_cf_to_string (UINT format)
{
char buf[100];
@@ -844,13 +844,13 @@ _gdk_win32_cf_to_string (UINT format)
}
}
-gchar *
+char *
_gdk_win32_data_to_string (const guchar *data,
int nbytes)
{
GString *s = g_string_new ("");
int i;
- gchar *retval;
+ char *retval;
for (i = 0; i < nbytes; i++)
if (data[i] >=' ' && data[i] <= '~')
@@ -864,7 +864,7 @@ _gdk_win32_data_to_string (const guchar *data,
return retval;
}
-gchar *
+char *
_gdk_win32_rect_to_string (const RECT *rect)
{
return static_printf ("%ldx%ld@%+ld%+ld",
@@ -872,7 +872,7 @@ _gdk_win32_rect_to_string (const RECT *rect)
rect->left, rect->top);
}
-gchar *
+char *
_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect)
{
return static_printf ("%dx%d@%+d%+d",
@@ -880,7 +880,7 @@ _gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect)
rect->x, rect->y);
}
-gchar *
+char *
_gdk_win32_cairo_region_to_string (const cairo_region_t *rgn)
{
cairo_rectangle_int_t extents;
@@ -890,7 +890,7 @@ _gdk_win32_cairo_region_to_string (const cairo_region_t *rgn)
extents.x, extents.y);
}
-gchar *
+char *
_gdk_win32_surface_description (GdkSurface *d)
{
g_return_val_if_fail (GDK_IS_SURFACE (d), NULL);
diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c
index 4171965fc7..9452f0f33b 100644
--- a/gdk/win32/gdkmonitor-win32.c
+++ b/gdk/win32/gdkmonitor-win32.c
@@ -186,7 +186,7 @@ get_device_property (HDEVINFO device_infoset,
if (error_code != ERROR_INSUFFICIENT_BUFFER)
{
- gchar *emsg = g_win32_error_message (error_code);
+ char *emsg = g_win32_error_message (error_code);
g_warning ("Failed to get device node property {" G_GUID_FORMAT "},%lu size: %s",
g_format_guid (&property_key->fmtid),
property_key->pid,
@@ -212,7 +212,7 @@ get_device_property (HDEVINFO device_infoset,
{
DWORD error_code = GetLastError ();
- gchar *emsg = g_win32_error_message (error_code);
+ char *emsg = g_win32_error_message (error_code);
g_warning ("Failed to get device node property {" G_GUID_FORMAT "},%lu: %s",
g_format_guid (&property_key->fmtid),
property_key->pid,
@@ -256,7 +256,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
for (device_index = 0; TRUE; device_index++)
{
gunichar2 *p;
- gchar *instance_path;
+ char *instance_path;
gunichar2 *prop;
DWORD proptype;
HKEY device_registry_key;
@@ -325,7 +325,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
{
if (proptype == DEVPROP_TYPE_STRING)
{
- gchar *manufacturer = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
+ char *manufacturer = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
gdk_monitor_set_manufacturer (mon, manufacturer);
g_free (manufacturer);
}
@@ -341,7 +341,7 @@ get_monitor_devices (GdkWin32Display *win32_display)
{
if (proptype == DEVPROP_TYPE_STRING)
{
- gchar *name = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
+ char *name = g_utf16_to_utf8 (prop, -1, NULL, NULL, NULL);
gdk_monitor_set_model (mon, name);
g_free (name);
}
@@ -456,7 +456,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
int i;
GdkWin32Monitor *w32mon;
GdkMonitor *mon;
- gchar *path, *path_lower;
+ char *path, *path_lower;
DISPLAYCONFIG_RATIONAL *refresh;
if ((dispconf_paths[path_index].flags & DISPLAYCONFIG_PATH_ACTIVE) == 0)
@@ -502,7 +502,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
if (!tdn.flags.friendlyNameForced)
{
/* monitorFriendlyDeviceName is usually nicer */
- gchar *name = g_utf16_to_utf8 (tdn.monitorFriendlyDeviceName, -1, NULL, NULL, NULL);
+ char *name = g_utf16_to_utf8 (tdn.monitorFriendlyDeviceName, -1, NULL, NULL, NULL);
gdk_monitor_set_model (mon, name);
g_free (name);
}
@@ -574,7 +574,7 @@ enum_monitor (HMONITOR hmonitor,
for (i_monitor = 0; TRUE; i_monitor++)
{
DISPLAY_DEVICEW dd_monitor;
- gchar *device_id_lower, *tmp;
+ char *device_id_lower, *tmp;
DWORD i;
GdkWin32Monitor *w32mon;
GdkMonitor *mon;
@@ -631,7 +631,7 @@ enum_monitor (HMONITOR hmonitor,
if (gdk_monitor_get_model (mon) == NULL)
{
- gchar *name = NULL;
+ char *name = NULL;
/* Only use dd.DeviceName as a last resort, as it is just
* \\.\DISPLAYX\MonitorY (for some values of X and Y).
diff --git a/gdk/win32/gdkmonitor-win32.h b/gdk/win32/gdkmonitor-win32.h
index c32f403169..6bfcd2bc1f 100644
--- a/gdk/win32/gdkmonitor-win32.h
+++ b/gdk/win32/gdkmonitor-win32.h
@@ -34,7 +34,7 @@ struct _GdkWin32Monitor
GdkRectangle work_rect;
/* Device instance path (used to match GdkWin32Monitor to monitor device) */
- gchar *instance_path;
+ char *instance_path;
/* TRUE if monitor is made up by us
* (this happens when system has logical monitors, but no physical ones).
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 86c0157369..9357d22be9 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -212,39 +212,39 @@ void _gdk_win32_print_system_palette (void);
void _gdk_win32_print_hpalette (HPALETTE hpal);
void _gdk_win32_print_dc (HDC hdc);
-gchar *_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol);
-gchar *_gdk_win32_surface_state_to_string (GdkSurfaceState state);
-gchar *_gdk_win32_surface_style_to_string (LONG style);
-gchar *_gdk_win32_surface_exstyle_to_string (LONG style);
-gchar *_gdk_win32_surface_pos_bits_to_string (UINT flags);
-gchar *_gdk_win32_drag_action_to_string (GdkDragAction actions);
-gchar *_gdk_win32_surface_description (GdkSurface *d);
-
-gchar *_gdk_win32_rop2_to_string (int rop2);
-gchar *_gdk_win32_lbstyle_to_string (UINT brush_style);
-gchar *_gdk_win32_pstype_to_string (DWORD pen_style);
-gchar *_gdk_win32_psstyle_to_string (DWORD pen_style);
-gchar *_gdk_win32_psendcap_to_string (DWORD pen_style);
-gchar *_gdk_win32_psjoin_to_string (DWORD pen_style);
-gchar *_gdk_win32_message_to_string (UINT msg);
-gchar *_gdk_win32_key_to_string (LONG lParam);
-gchar *_gdk_win32_cf_to_string (UINT format);
-gchar *_gdk_win32_data_to_string (const guchar*data,
+char *_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol);
+char *_gdk_win32_surface_state_to_string (GdkSurfaceState state);
+char *_gdk_win32_surface_style_to_string (LONG style);
+char *_gdk_win32_surface_exstyle_to_string (LONG style);
+char *_gdk_win32_surface_pos_bits_to_string (UINT flags);
+char *_gdk_win32_drag_action_to_string (GdkDragAction actions);
+char *_gdk_win32_surface_description (GdkSurface *d);
+
+char *_gdk_win32_rop2_to_string (int rop2);
+char *_gdk_win32_lbstyle_to_string (UINT brush_style);
+char *_gdk_win32_pstype_to_string (DWORD pen_style);
+char *_gdk_win32_psstyle_to_string (DWORD pen_style);
+char *_gdk_win32_psendcap_to_string (DWORD pen_style);
+char *_gdk_win32_psjoin_to_string (DWORD pen_style);
+char *_gdk_win32_message_to_string (UINT msg);
+char *_gdk_win32_key_to_string (LONG lParam);
+char *_gdk_win32_cf_to_string (UINT format);
+char *_gdk_win32_data_to_string (const guchar*data,
int nbytes);
-gchar *_gdk_win32_rect_to_string (const RECT *rect);
+char *_gdk_win32_rect_to_string (const RECT *rect);
-gchar *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
-gchar *_gdk_win32_cairo_region_to_string (const cairo_region_t *box);
+char *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
+char *_gdk_win32_cairo_region_to_string (const cairo_region_t *box);
void _gdk_win32_print_event (GdkEvent *event);
#endif
-gchar *_gdk_win32_last_error_string (void);
-void _gdk_win32_api_failed (const gchar *where,
- const gchar *api);
-void _gdk_other_api_failed (const gchar *where,
- const gchar *api);
+char *_gdk_win32_last_error_string (void);
+void _gdk_win32_api_failed (const char *where,
+ const char *api);
+void _gdk_other_api_failed (const char *where,
+ const char *api);
#define WIN32_API_FAILED(api) _gdk_win32_api_failed (G_STRLOC , api)
#define WIN32_GDI_FAILED(api) WIN32_API_FAILED (api)
@@ -329,7 +329,7 @@ HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
void _gdk_win32_display_init_cursors (GdkWin32Display *display);
void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);
void _gdk_win32_display_update_cursors (GdkWin32Display *display);
-GdkCursor *_gdk_win32_display_get_cursor_for_name (GdkDisplay *display, const gchar* cursor_name);
+GdkCursor *_gdk_win32_display_get_cursor_for_name (GdkDisplay *display, const char * cursor_name);
GdkCursor *gdk_win32_display_cursor_from_hcursor (GdkDisplay *display, HCURSOR hcursor);
typedef struct _Win32CursorTheme Win32CursorTheme;
@@ -357,10 +357,10 @@ struct _Win32Cursor {
int xcursor_number;
};
-Win32CursorTheme *win32_cursor_theme_load (const gchar *name,
+Win32CursorTheme *win32_cursor_theme_load (const char *name,
int size);
Win32Cursor * win32_cursor_theme_get_cursor (Win32CursorTheme *theme,
- const gchar *name);
+ const char *name);
void win32_cursor_theme_destroy (Win32CursorTheme *theme);
Win32CursorTheme *_gdk_win32_display_get_cursor_theme (GdkWin32Display *win32_display);
@@ -399,13 +399,13 @@ GdkDrag *_gdk_win32_surface_drag_begin (GdkSurface *window,
double y_root);
/* Stray GdkWin32Screen members */
-gboolean _gdk_win32_get_setting (const gchar *name, GValue *value);
+gboolean _gdk_win32_get_setting (const char *name, GValue *value);
void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen);
GdkSurface *gdk_win32_screen_get_root_window (GdkWin32Screen *screen);
GdkSurface *gdk_win32_display_get_root_window (GdkDisplay *display);
/* Distributed display manager implementation */
-GdkDisplay *_gdk_win32_display_open (const gchar *display_name);
+GdkDisplay *_gdk_win32_display_open (const char *display_name);
void _gdk_win32_append_event (GdkEvent *event);
void _gdk_win32_emit_configure_event (GdkSurface *window);
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index a5c9ade81a..0cbd3f0095 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -33,12 +33,12 @@
#include "gdkprivate-win32.h"
#include "gdkwin32.h"
-static gchar*
+static char *
_get_system_font_name (HDC hdc)
{
NONCLIENTMETRICSW ncm;
PangoFontDescription *font_desc;
- gchar *result, *font_desc_string;
+ char *result, *font_desc_string;
int logpixelsy;
int font_size;
@@ -98,7 +98,7 @@ _get_system_font_name (HDC hdc)
*/
gboolean
-_gdk_win32_get_setting (const gchar *name,
+_gdk_win32_get_setting (const char *name,
GValue *value)
{
/*
@@ -188,7 +188,7 @@ _gdk_win32_get_setting (const gchar *name,
}
else if (strcmp ("gtk-font-name", name) == 0)
{
- gchar *font_name = _get_system_font_name (_gdk_display_hdc);
+ char *font_name = _get_system_font_name (_gdk_display_hdc);
if (font_name)
{
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 428311904b..06af6e8303 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -312,7 +312,7 @@ _gdk_win32_surface_enable_transparency (GdkSurface *window)
return SUCCEEDED (call_result);
}
-static const gchar *
+static const char *
get_default_title (void)
{
const char *title;
@@ -355,7 +355,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
/* initialize once! */
if (0 == hAppIcon && 0 == hAppIconSm)
{
- gchar sLoc [MAX_PATH+1];
+ char sLoc [MAX_PATH+1];
if (0 != GetModuleFileName (_gdk_dll_hinstance, sLoc, MAX_PATH))
{
@@ -486,7 +486,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
GdkWin32Surface *impl;
GdkWin32Display *display_win32;
GdkSurface *surface;
- const gchar *title;
+ const char *title;
wchar_t *wtitle;
int window_width, window_height;
int window_x, window_y;
@@ -1529,7 +1529,7 @@ gdk_win32_surface_set_geometry_hints (GdkSurface *window,
static void
gdk_win32_surface_set_title (GdkSurface *window,
- const gchar *title)
+ const char *title)
{
wchar_t *wtitle;
@@ -2029,7 +2029,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
#if defined(MORE_AEROSNAP_DEBUGGING)
static void
-log_region (gchar *prefix, AeroSnapEdgeRegion *region)
+log_region (char *prefix, AeroSnapEdgeRegion *region)
{
GDK_NOTE (MISC, g_print ("Region %s:\n"
"edge %d x %d @ %d x %d\n"
@@ -3456,7 +3456,7 @@ handle_aerosnap_move_resize (GdkSurface *window,
}
-static const gchar *
+static const char *
get_cursor_name_from_op (GdkW32WindowDragOp op,
GdkSurfaceEdge edge)
{
@@ -3511,7 +3511,7 @@ setup_drag_move_resize_context (GdkSurface *window,
guint32 timestamp)
{
RECT rect;
- const gchar *cursor_name;
+ const char *cursor_name;
GdkSurface *pointer_window;
GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
gboolean maximized = gdk_toplevel_get_state (GDK_TOPLEVEL (window)) & GDK_SURFACE_STATE_MAXIMIZED;
diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index 6eebe6e76d..a91fe3e49d 100644
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -54,7 +54,7 @@ GType gdk_win32_display_get_type (void);
GDK_AVAILABLE_IN_ALL
void gdk_win32_display_set_cursor_theme (GdkDisplay *display,
- const gchar *name,
+ const char *name,
int size);
/**
diff --git a/gdk/win32/xcursors.h b/gdk/win32/xcursors.h
index 03e10d12e2..a7a95a2515 100644
--- a/gdk/win32/xcursors.h
+++ b/gdk/win32/xcursors.h
@@ -1,4 +1,4 @@
-static const struct { const gchar *name; const gchar *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = {
+static const struct { const char *name; const char *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; char *data; } cursors[] = {
{ "X_cursor", NULL, 0, 16, 16, 7, 7,
"\125\000\000\125\152\100\001\251\152\220\006\251\152\244\032\251"
"\032\251\152\244\006\252\252\220\001\252\252\100\000\152\251\000"
View Lorry Controller Status