summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.c6
-rw-r--r--gdk/gdkevents.c2
-rw-r--r--gdk/x11/gdkdisplay-x11.c2
-rw-r--r--gdk/x11/gdkdnd-x11.c2
-rw-r--r--gdk/x11/gdkdrawable-x11.c2
-rw-r--r--gdk/x11/gdkim-x11.c2
-rw-r--r--gdk/x11/gdkimage-x11.c10
-rw-r--r--gdk/x11/gdkmain-x11.c4
-rw-r--r--gdk/x11/gdkscreen-x11.c2
-rw-r--r--gdk/x11/gdkwindow-x11.c10
10 files changed, 21 insertions, 21 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 7af44a5734..f9d418a8fc 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -353,13 +353,13 @@ gdk_exit (gint errorcode)
}
void
-gdk_threads_enter ()
+gdk_threads_enter (void)
{
GDK_THREADS_ENTER ();
}
void
-gdk_threads_leave ()
+gdk_threads_leave (void)
{
GDK_THREADS_LEAVE ();
}
@@ -389,7 +389,7 @@ gdk_threads_impl_unlock (void)
* GTK+; to be safe, call it before gtk_init().
**/
void
-gdk_threads_init ()
+gdk_threads_init (void)
{
if (!g_thread_supported ())
g_error ("g_thread_init() must be called before gdk_threads_init()");
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 8398146714..32108cba5c 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1042,7 +1042,7 @@ _gdk_event_button_generate (GdkDisplay *display,
display->button_click_time[1] = 0;
display->button_click_time[0] = 0;
display->button_window[1] = NULL;
- display->button_window[0] = 0;
+ display->button_window[0] = NULL;
display->button_number[1] = -1;
display->button_number[0] = -1;
display->button_x[0] = display->button_x[1] = 0;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 4db944d2ba..df791419a3 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -917,7 +917,7 @@ broadcast_xmessage (GdkDisplay *display,
0,
CopyFromParent,
CopyFromParent,
- CopyFromParent,
+ (Visual *)CopyFromParent,
CWOverrideRedirect | CWEventMask,
&attrs);
}
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 2d35bcde81..5eb2cd7ddf 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -853,7 +853,7 @@ motif_find_drag_window (GdkDisplay *display,
XCreateWindow (persistant_xdisplay,
RootWindow (persistant_xdisplay, 0),
-100, -100, 10, 10, 0, 0,
- InputOnly, CopyFromParent,
+ InputOnly, (Visual *)CopyFromParent,
(CWOverrideRedirect | CWEventMask), &attr);
GDK_NOTE (DND,
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index f55c29f803..2308a3acd8 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -853,7 +853,7 @@ static GdkDrawable * get_impl_drawable (GdkDrawable *drawable)
else
{
g_warning (G_STRLOC " drawable is not a pixmap or window");
- return None;
+ return (GdkDrawable *)None;
}
return impl;
}
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 20d68ca522..651a16ab3b 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -109,7 +109,7 @@ gdk_set_locale (void)
}
static GdkDisplay *
-find_a_display ()
+find_a_display (void)
{
GdkDisplay *display = gdk_display_get_default ();
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 47363f326b..d1970a1639 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -183,7 +183,7 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height)
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
private->ximage = XCreateImage (GDK_SCREEN_XDISPLAY (private->screen),
xvisual, 1, XYBitmap,
- 0, 0, width, height, 8, 0);
+ 0, NULL, width, height, 8, 0);
}
private->ximage->data = data;
@@ -318,7 +318,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
}
x_shm_info->readOnly = False;
- x_shm_info->shmaddr = shmat (x_shm_info->shmid, 0, 0);
+ x_shm_info->shmaddr = shmat (x_shm_info->shmid, NULL, 0);
private->ximage->data = x_shm_info->shmaddr;
if (x_shm_info->shmaddr == (char*) -1)
@@ -350,7 +350,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
* we die in XShmAttach. In theory, a signal handler
* could be set up.
*/
- shmctl (x_shm_info->shmid, IPC_RMID, 0);
+ shmctl (x_shm_info->shmid, IPC_RMID, NULL);
if (image)
image_list = g_list_prepend (image_list, image);
@@ -361,7 +361,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
break;
case GDK_IMAGE_NORMAL:
private->ximage = XCreateImage (screen_x11->xdisplay, xvisual, depth,
- ZPixmap, 0, 0, width, height, 32, 0);
+ ZPixmap, 0, NULL, width, height, 32, 0);
/* Use malloc, not g_malloc here, because X will call free()
* on this data
@@ -402,7 +402,7 @@ _gdk_image_new_for_depth (GdkScreen *screen,
if (x_shm_info->shmaddr != (char *)-1)
shmdt (x_shm_info->shmaddr);
if (x_shm_info->shmid != -1)
- shmctl (x_shm_info->shmid, IPC_RMID, 0);
+ shmctl (x_shm_info->shmid, IPC_RMID, NULL);
g_free (x_shm_info);
private->x_shm_info = NULL;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index ae9a22200f..287415ebc5 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -736,7 +736,7 @@ _gdk_region_get_xrectangles (GdkRegion *region,
* gdk_x11_grab_server()/gdk_x11_ungrab_server() calls can be nested.
**/
void
-gdk_x11_grab_server ()
+gdk_x11_grab_server (void)
{
gdk_x11_display_grab (gdk_display_get_default ());
}
@@ -748,7 +748,7 @@ gdk_x11_grab_server ()
* gdk_x11_grab_server().
**/
void
-gdk_x11_ungrab_server ()
+gdk_x11_ungrab_server (void)
{
gdk_x11_display_ungrab (gdk_display_get_default ());
}
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 80908580d7..0856a010f6 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -61,7 +61,7 @@ static gpointer parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
GType
-_gdk_screen_x11_get_type ()
+_gdk_screen_x11_get_type (void)
{
static GType object_type = 0;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 410e000e5b..d6dfda7dfe 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2262,7 +2262,7 @@ gdk_window_set_modal_hint (GdkWindow *window,
if (GDK_WINDOW_IS_MAPPED (window))
gdk_wmspec_change_state (modal, window,
gdk_atom_intern ("_NET_WM_STATE_MODAL", FALSE),
- 0);
+ NULL);
}
/**
@@ -2298,7 +2298,7 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
if (GDK_WINDOW_IS_MAPPED (window))
gdk_wmspec_change_state (skips_taskbar, window,
gdk_atom_intern ("_NET_WM_STATE_SKIP_TASKBAR", FALSE),
- 0);
+ NULL);
}
/**
@@ -2335,7 +2335,7 @@ gdk_window_set_skip_pager_hint (GdkWindow *window,
if (GDK_WINDOW_IS_MAPPED (window))
gdk_wmspec_change_state (skips_pager, window,
gdk_atom_intern ("_NET_WM_STATE_SKIP_PAGER", FALSE),
- 0);
+ NULL);
}
/**
@@ -4064,7 +4064,7 @@ gdk_window_stick (GdkWindow *window)
/* Request stick during viewport scroll */
gdk_wmspec_change_state (TRUE, window,
gdk_atom_intern ("_NET_WM_STATE_STICKY", FALSE),
- 0);
+ NULL);
/* Request desktop 0xFFFFFFFF */
xev.xclient.type = ClientMessage;
@@ -4124,7 +4124,7 @@ gdk_window_unstick (GdkWindow *window)
/* Request unstick from viewport */
gdk_wmspec_change_state (FALSE, window,
gdk_atom_intern ("_NET_WM_STATE_STICKY", FALSE),
- 0);
+ NULL);
/* Get current desktop, then set it; this is a race, but not
* one that matters much in practice.
View Lorry Controller Status