* 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/>.
*/
#include "config.h"
#include "gtkprintoperation.h" /* for GtkPrintError */
#include "gtkintl.h"
+#ifdef G_OS_UNIX /* _gtk_load_custom_papers() only on Unix so far */
+#include "gtkcustompaperunixdialog.h"
+#endif
+
#include "paper_names_offsets.c"
* @display_name: the human-readable name
* @width: the paper width, in units of @unit
* @height: the paper height, in units of @unit
- * @unit: the unit for @width and @height
+ * @unit: the unit for @width and @height. not %GTK_UNIT_NONE.
*
* Creates a new #GtkPaperSize object with the
* given parameters.
{
GtkPaperSize *size;
g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (unit != GTK_UNIT_PIXEL, NULL);
+ g_return_val_if_fail (unit != GTK_UNIT_NONE, NULL);
size = g_slice_new0 (GtkPaperSize);
gtk_paper_size_get_name (size2)) == 0;
}
-GList * _gtk_load_custom_papers (void);
-
/**
* gtk_paper_size_get_paper_sizes:
* @include_custom: whether to include custom paper sizes
list = g_list_prepend (list, gtk_paper_size_copy (size));
}
- g_list_foreach (page_setups, (GFunc) g_object_unref, NULL);
- g_list_free (page_setups);
+ g_list_free_full (page_setups, g_object_unref);
}
#endif
for (i = 0; i < G_N_ELEMENTS (standard_names_offsets); ++i)
*
* Since: 2.10
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_paper_size_get_name (GtkPaperSize *size)
{
if (size->name)
*
* Since: 2.10
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_paper_size_get_display_name (GtkPaperSize *size)
{
const gchar *display_name;
*
* Since: 2.10
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_paper_size_get_ppd_name (GtkPaperSize *size)
{
if (size->ppd_name)
/**
* gtk_paper_size_get_width:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the paper width of the #GtkPaperSize, in
* units of @unit.
/**
* gtk_paper_size_get_height:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the paper height of the #GtkPaperSize, in
* units of @unit.
*
* Since: 2.10
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_paper_size_get_default (void)
{
char *locale, *freeme = NULL;
/**
* gtk_paper_size_get_default_top_margin:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the default top margin for the #GtkPaperSize.
*
/**
* gtk_paper_size_get_default_bottom_margin:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the default bottom margin for the #GtkPaperSize.
*
/**
* gtk_paper_size_get_default_left_margin:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the default left margin for the #GtkPaperSize.
*
/**
* gtk_paper_size_get_default_right_margin:
* @size: a #GtkPaperSize object
- * @unit: the unit for the return value
+ * @unit: the unit for the return value, not %GTK_UNIT_NONE
*
* Gets the default right margin for the #GtkPaperSize.
*
* @key_file.
*
* Returns: a new #GtkPaperSize object with the restored
- * paper size, or %NULL if an error occurred.
+ * paper size, or %NULL if an error occurred
*
* Since: 2.12
*/
GtkPaperSize *
-gtk_paper_size_new_from_key_file (GKeyFile *key_file,
- const gchar *group_name,
- GError **error)
+gtk_paper_size_new_from_key_file (GKeyFile *key_file,
+ const gchar *group_name,
+ GError **error)
{
GtkPaperSize *paper_size = NULL;
- char *name = NULL, *ppd_name = NULL, *display_name = NULL, *freeme = NULL;
+ gchar *name = NULL;
+ gchar *ppd_name = NULL;
+ gchar *display_name = NULL;
+ gchar *freeme = NULL;
gdouble width, height;
- gboolean retval = TRUE;
GError *err = NULL;
g_return_val_if_fail (key_file != NULL, NULL);
GTK_PRINT_ERROR,
GTK_PRINT_ERROR_INVALID_FILE,
_("Not a valid page setup file"));
- retval = FALSE;
goto out;
}
if (err != NULL) \
{\
g_propagate_error (error, err);\
- retval = FALSE;\
goto out;\
}
GTK_PRINT_ERROR,
GTK_PRINT_ERROR_INVALID_FILE,
_("Not a valid page setup file"));
- retval = FALSE;
goto out;
}
+
g_assert (paper_size != NULL);
out: