New upstream version 3.23.0

2018-07-18 14:06:19 +01:00
parent 048c0e7f38 593edacb48
commit 609c36368b
731 changed files with 556100 additions and 542972 deletions
--- a/docs/reference/gtk/html/GtkMessageDialog.html
+++ b/docs/reference/gtk/html/GtkMessageDialog.html
@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GtkMessageDialog: GTK+ 3 Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="GTK+ 3 Reference Manual">
 <link rel="up" href="WindowWidgets.html" title="Windows">
 <link rel="prev" href="GtkDialog.html" title="GtkDialog">
 <link rel="next" href="GtkAboutDialog.html" title="GtkAboutDialog">
-<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@ -240,77 +240,38 @@ you can also pass in the <a class="link" href="GtkDialog.html#GTK-DIALOG-MODAL:C
 makes the dialog modal and waits for the user to respond to it. <a class="link" href="GtkDialog.html#gtk-dialog-run" title="gtk_dialog_run ()"><code class="function">gtk_dialog_run()</code></a>
 returns when any dialog button is clicked.</p>
 <p>An example for using a modal dialog:</p>
-<div class="informalexample">
-  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-      <tr>
-        <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6
-7
-8
-9
-10</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkDialogFlags</span><span class="normal"> flags </span><span class="symbol">=</span><span class="normal"> <a href="GtkDialog.html#GTK-DIALOG-DESTROY-WITH-PARENT:CAPS">GTK_DIALOG_DESTROY_WITH_PARENT</a></span><span class="symbol">;</span>
-<span class="normal">dialog </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkMessageDialog.html#gtk-message-dialog-new">gtk_message_dialog_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parent_window</span><span class="symbol">,</span>
-<span class="normal">                                 flags</span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-MESSAGE-ERROR:CAPS">GTK_MESSAGE_ERROR</a></span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-BUTTONS-CLOSE:CAPS">GTK_BUTTONS_CLOSE</a></span><span class="symbol">,</span>
-<span class="normal">                                 </span><span class="string">"Error reading “%s”: %s"</span><span class="symbol">,</span>
-<span class="normal">                                 filename</span><span class="symbol">,</span>
-<span class="normal">                                 </span><span class="function">g_strerror</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">errno</span><span class="symbol">));</span>
-<span class="function"><a href="GtkDialog.html#gtk-dialog-run">gtk_dialog_run</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">GTK_DIALOG</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">dialog</span><span class="symbol">));</span>
-<span class="function"><a href="GtkWidget.html#gtk-widget-destroy">gtk_widget_destroy</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">dialog</span><span class="symbol">);</span></pre></td>
-      </tr>
-    </tbody>
-  </table>
-</div>
-
+<div class="informalexample"><pre class="programlisting">
+ GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
+ dialog = gtk_message_dialog_new (parent_window,
+                                  flags,
+                                  GTK_MESSAGE_ERROR,
+                                  GTK_BUTTONS_CLOSE,
+                                  "Error reading “%s”: %s",
+                                  filename,
+                                  g_strerror (errno));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+</pre></div>
 <p></p>
 <p>You might do a non-modal <a class="link" href="GtkMessageDialog.html" title="GtkMessageDialog"><span class="type">GtkMessageDialog</span></a> as follows:</p>
 <p>An example for a non-modal dialog:</p>
-<div class="informalexample">
-  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-      <tr>
-        <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkDialogFlags</span><span class="normal"> flags </span><span class="symbol">=</span><span class="normal"> <a href="GtkDialog.html#GTK-DIALOG-DESTROY-WITH-PARENT:CAPS">GTK_DIALOG_DESTROY_WITH_PARENT</a></span><span class="symbol">;</span>
-<span class="normal">dialog </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkMessageDialog.html#gtk-message-dialog-new">gtk_message_dialog_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parent_window</span><span class="symbol">,</span>
-<span class="normal">                                 flags</span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-MESSAGE-ERROR:CAPS">GTK_MESSAGE_ERROR</a></span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-BUTTONS-CLOSE:CAPS">GTK_BUTTONS_CLOSE</a></span><span class="symbol">,</span>
-<span class="normal">                                 </span><span class="string">"Error reading “%s”: %s"</span><span class="symbol">,</span>
-<span class="normal">                                 filename</span><span class="symbol">,</span>
-<span class="normal">                                 </span><span class="function">g_strerror</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">errno</span><span class="symbol">));</span>
+<div class="informalexample"><pre class="programlisting">
+ GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
+ dialog = gtk_message_dialog_new (parent_window,
+                                  flags,
+                                  GTK_MESSAGE_ERROR,
+                                  GTK_BUTTONS_CLOSE,
+                                  "Error reading “%s”: %s",
+                                  filename,
+                                  g_strerror (errno));

-<span class="comment">// Destroy the dialog when the user responds to it</span>
-<span class="comment">// (e.g. clicks a button)</span>
-
-<span class="function">g_signal_connect_swapped</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">dialog</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"response"</span><span class="symbol">,</span>
-<span class="normal">                          </span><span class="function">G_CALLBACK</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="GtkWidget.html#gtk-widget-destroy">gtk_widget_destroy</a></span><span class="symbol">),</span>
-<span class="normal">                          dialog</span><span class="symbol">);</span></pre></td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+ // Destroy the dialog when the user responds to it
+ // (e.g. clicks a button)

+ g_signal_connect_swapped (dialog, "response",
+                           G_CALLBACK (gtk_widget_destroy),
+                           dialog);
+</pre></div>
 <p></p>
 <div class="refsect2">
 <a name="id-1.3.6.4.10.12"></a><h3>GtkMessageDialog as GtkBuildable</h3>
@ -344,7 +305,7 @@ signal is emitted with response IDs from <a class="link" href="GtkDialog.html#Gt
 <tbody>
 <tr>
 <td class="parameter_name"><p>parent</p></td>
-<td class="parameter_description"><p>transient parent, or <code class="literal">NULL</code> for none. </p></td>
+<td class="parameter_description"><p> transient parent, or <code class="literal">NULL</code> for none. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@ -364,7 +325,7 @@ signal is emitted with response IDs from <a class="link" href="GtkDialog.html#Gt
 </tr>
 <tr>
 <td class="parameter_name"><p>message_format</p></td>
-<td class="parameter_description"><p>printf()-style format string, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> <code class="function">printf()</code>-style format string, or <code class="literal">NULL</code>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@ -378,7 +339,7 @@ signal is emitted with response IDs from <a class="link" href="GtkDialog.html#Gt
 </div>
 <div class="refsect3">
 <a name="gtk-message-dialog-new.returns"></a><h4>Returns</h4>
-<p>a new <a class="link" href="GtkMessageDialog.html" title="GtkMessageDialog"><span class="type">GtkMessageDialog</span></a>. </p>
+<p> a new <a class="link" href="GtkMessageDialog.html" title="GtkMessageDialog"><span class="type">GtkMessageDialog</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@ -405,33 +366,17 @@ label, then you need to use <a class="link" href="GtkMessageDialog.html#gtk-mess
 instead, since you can’t pass the markup string either
 as the format (it might contain “%” characters) or as a string
 argument.</p>
-<div class="informalexample">
-  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-      <tr>
-        <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6
-7
-8
-9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">dialog</span><span class="symbol">;</span>
-<span class="usertype">GtkDialogFlags</span><span class="normal"> flags </span><span class="symbol">=</span><span class="normal"> <a href="GtkDialog.html#GTK-DIALOG-DESTROY-WITH-PARENT:CAPS">GTK_DIALOG_DESTROY_WITH_PARENT</a></span><span class="symbol">;</span>
-<span class="normal">dialog </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkMessageDialog.html#gtk-message-dialog-new">gtk_message_dialog_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parent_window</span><span class="symbol">,</span>
-<span class="normal">                                 flags</span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-MESSAGE-ERROR:CAPS">GTK_MESSAGE_ERROR</a></span><span class="symbol">,</span>
-<span class="normal">                                 <a href="GtkMessageDialog.html#GTK-BUTTONS-CLOSE:CAPS">GTK_BUTTONS_CLOSE</a></span><span class="symbol">,</span>
-<span class="normal">                                 NULL</span><span class="symbol">);</span>
-<span class="function"><a href="GtkMessageDialog.html#gtk-message-dialog-set-markup">gtk_message_dialog_set_markup</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">GTK_MESSAGE_DIALOG</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">dialog</span><span class="symbol">),</span>
-<span class="normal">                               markup</span><span class="symbol">);</span></pre></td>
-      </tr>
-    </tbody>
-  </table>
-</div>
-
+<div class="informalexample"><pre class="programlisting">
+ GtkWidget *dialog;
+ GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
+ dialog = gtk_message_dialog_new (parent_window,
+                                  flags,
+                                  GTK_MESSAGE_ERROR,
+                                  GTK_BUTTONS_CLOSE,
+                                  NULL);
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
+                                markup);
+</pre></div>
 <p></p>
 <div class="refsect3">
 <a name="gtk-message-dialog-new-with-markup.parameters"></a><h4>Parameters</h4>
@ -444,7 +389,7 @@ argument.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>parent</p></td>
-<td class="parameter_description"><p>transient parent, or <code class="literal">NULL</code> for none. </p></td>
+<td class="parameter_description"><p> transient parent, or <code class="literal">NULL</code> for none. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@ -464,7 +409,7 @@ argument.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>message_format</p></td>
-<td class="parameter_description"><p>printf()-style format string, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> <code class="function">printf()</code>-style format string, or <code class="literal">NULL</code>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@ -578,7 +523,7 @@ gtk_message_dialog_get_image (<em class="parameter"><code><a class="link" href="
 </div>
 <div class="refsect3">
 <a name="gtk-message-dialog-get-image.returns"></a><h4>Returns</h4>
-<p>the dialog’s image. </p>
+<p> the dialog’s image. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 2.14</p>
@ -610,7 +555,7 @@ gtk_message_dialog_format_secondary_text
 </tr>
 <tr>
 <td class="parameter_name"><p>message_format</p></td>
-<td class="parameter_description"><p>printf()-style format string, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_description"><p> <code class="function">printf()</code>-style format string, or <code class="literal">NULL</code>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@ -640,27 +585,14 @@ Pango text markup language.</p>
 like <a class="link" href="GtkMessageDialog.html#gtk-message-dialog-new-with-markup" title="gtk_message_dialog_new_with_markup ()"><code class="function">gtk_message_dialog_new_with_markup()</code></a> does. Thus, if the arguments
 may contain special XML characters, you should use <code class="function">g_markup_printf_escaped()</code>
 to escape it.</p>
-<div class="informalexample">
-  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-      <tr>
-        <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">gchar</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">msg</span><span class="symbol">;</span>
-
-<span class="normal">msg </span><span class="symbol">=</span><span class="normal"> </span><span class="function">g_markup_printf_escaped</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">message_format</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">...);</span>
-<span class="function"><a href="GtkMessageDialog.html#gtk-message-dialog-format-secondary-markup">gtk_message_dialog_format_secondary_markup</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">message_dialog</span><span class="symbol">,</span>
-<span class="normal">                                            </span><span class="string">"%s"</span><span class="symbol">,</span><span class="normal"> msg</span><span class="symbol">);</span>
-<span class="function">g_free</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">msg</span><span class="symbol">);</span></pre></td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+<div class="informalexample"><pre class="programlisting">
+gchar *msg;

+msg = g_markup_printf_escaped (message_format, ...);
+gtk_message_dialog_format_secondary_markup (message_dialog,
+                                            "%s", msg);
+g_free (msg);
+</pre></div>
 <p></p>
 <div class="refsect3">
 <a name="gtk-message-dialog-format-secondary-markup.parameters"></a><h4>Parameters</h4>
@ -720,7 +652,7 @@ function in the parent <a class="link" href="GtkDialog.html" title="GtkDialog"><
 </div>
 <div class="refsect3">
 <a name="gtk-message-dialog-get-message-area.returns"></a><h4>Returns</h4>
-<p>A <a class="link" href="GtkBox.html" title="GtkBox"><span class="type">GtkBox</span></a> corresponding to the
+<p> A <a class="link" href="GtkBox.html" title="GtkBox"><span class="type">GtkBox</span></a> corresponding to the
 “message area” in the <em class="parameter"><code>message_dialog</code></em>
 . </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@ -950,6 +882,6 @@ See <code class="function">pango_parse_markup()</code>.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.27</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>