Fix problems discovered while testing on Windows.

* Set the working directory for glib-genmarshal correctly.
* Use one more path suffix when searching for glibconfig.h.
* Don't assume that gdk_screen_get_resolution() returns
  a useful value.
This commit is contained in:
2010-12-20 05:20:21 +01:00
parent b44b3e6a54
commit 9dc1822040
3 changed files with 21 additions and 4 deletions

View File

@@ -36,6 +36,9 @@
/* Tolerance on all sides of symbols for strokes. */
#define SYMBOL_AREA_TOLERANCE 0.5
/* The default screen resolution in DPI units. */
#define DEFAULT_SCREEN_RESOLUTION 96
/*
* LdCanvasPrivate:
* @diagram: A diagram object assigned to this canvas as a model.
@@ -455,11 +458,16 @@ ld_canvas_get_library (LdCanvas *self)
static gdouble
ld_canvas_get_base_unit_in_px (GtkWidget *self)
{
gdouble resolution;
g_return_val_if_fail (GTK_IS_WIDGET (self), 1);
resolution = gdk_screen_get_resolution (gtk_widget_get_screen (self));
if (resolution == -1)
resolution = DEFAULT_SCREEN_RESOLUTION;
/* XXX: It might look better if the unit was rounded to a whole number. */
return gdk_screen_get_resolution (gtk_widget_get_screen (self))
/ MM_PER_INCH * LD_CANVAS_BASE_UNIT_LENGTH;
return resolution / MM_PER_INCH * LD_CANVAS_BASE_UNIT_LENGTH;
}
/*