Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gdk / tmpl / general.sgml

diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index c2ebc20997aab62c86f5c304649285ff95f2e912..3278731c8cd9372d5bafe2655cd25bfec0a277c6 100644 (file)
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -18,6 +18,9 @@ utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
 locale.
 </para>
 
+@void: 
 @Returns: the resulting locale.
 
 
@@ -123,6 +128,15 @@ of g_atexit()).
 
 </para>
 
+@void: 
+
+
+<!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
+<para>
+
+</para>
+
+@startup_id: 
 
 
 <!-- ##### FUNCTION gdk_get_program_class ##### -->
@@ -133,6 +147,7 @@ commandline option, the default value is the program name (determined
 with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
+@void: 
 @Returns: the program class.
 
 
@@ -152,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
 environment variable or the <option>--display</option> command line option.
 </para>
 
+@void: 
 @Returns: the name of the display.
 
 
@@ -162,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
 trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_screen_width ##### -->
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -175,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -182,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -189,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -215,6 +236,11 @@ press and release events in pairs.
 It is equivalent to a pointer grab on the window with @owner_events set to
 %TRUE.
 </para>
+<para>
+If you set up anything at the time you take the grab that needs to be cleaned
+up when the grab ends, you should handle the #GdkEventGrabBroken events that
+are emitted when the grab ends unvoluntarily.
+</para>
 
 @window: the #GdkWindow which will own the grab (the grab window).
 @owner_events: if %FALSE then all pointer events are reported with respect to
@@ -266,6 +292,7 @@ success or the reason for the failure of the grab attempt.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -283,6 +310,11 @@ Grabs the keyboard so that all events are passed to this
 application until the keyboard is ungrabbed with gdk_keyboard_ungrab().
 This overrides any previous keyboard grab by this client.
 </para>
+<para>
+If you set up anything at the time you take the grab that needs to be cleaned
+up when the grab ends, you should handle the #GdkEventGrabBroken events that
+are emitted when the grab ends unvoluntarily.
+</para>
 
 @window: the #GdkWindow which will own the grab (the grab window).
 @owner_events: if %FALSE then all keyboard events are reported with respect to
@@ -306,6 +338,7 @@ available.
 <para>
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -320,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
 server are on the same machine and the server supports it.
 </para>
 
+@void: 
 @Returns: %TRUE if use of the MIT shared memory extension will be attempted.
 
 
@@ -357,6 +391,7 @@ avoid the X error in any other way.
 </programlisting>
 </example>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -364,6 +399,7 @@ avoid the X error in any other way.
 Removes the X error trap installed with gdk_error_trap_push().
 </para>
 
+@void: 
 @Returns: the X error code, or 0 if no error occurred.
 
 
@@ -381,10 +417,3 @@ This macro is defined if GDK is configured to use the Win32 backend.
 
 
 
-<!-- ##### MACRO GDK_WINDOWING_FB ##### -->
-<para>
-This macro is defined if GDK is configured to use the Linux framebuffer backend.
-</para>
-
-
-