Popdown the bubble window when text view is scrolled

[~andy/gtk] / gtk / gtkpapersize.h

diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 864eb3818e5bca14842f01263c2849606a740aef..f7cf20da5e70116c4b99a3e19edbafb43072cf49 100644 (file)
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -13,19 +13,17 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_PAPER_SIZE_H__
 #define __GTK_PAPER_SIZE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkenums.h>
 
 
@@ -105,9 +103,9 @@ gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
 GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
@@ -128,7 +126,7 @@ gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
                                                  GtkUnit       unit);
 
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+const gchar *gtk_paper_size_get_default (void);
 
 GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
                                                const gchar *group_name,