summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakryukov <akryukov>2011-01-21 10:02:13 +0000
committerakryukov <akryukov>2011-01-21 10:02:13 +0000
commitf78cd989bb1c7bed09379e2868970980fee96d03 (patch)
tree8fcafe15e40b1edc7e5cc05cd6e44b04982917a1
parent3e324db0adf81e8a293cab32606f19a5d904aca9 (diff)
Pasting bitmaps from fontview didn't work.
-rw-r--r--fontforge/bitmapview.c4
-rw-r--r--fontforge/cvundoes.c1
-rw-r--r--fontforge/stamp.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/fontforge/bitmapview.c b/fontforge/bitmapview.c
index c80142ab..36ca209f 100644
--- a/fontforge/bitmapview.c
+++ b/fontforge/bitmapview.c
@@ -1952,7 +1952,7 @@ void BVMenuRotateInvoked(GWindow gw,struct gmenuitem *mi,GEvent *g) {
BVRotateBitmap(bv,mi->mid);
}
-static void edlistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) {
+static void ellistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) {
BitmapView *bv = (BitmapView *) GDrawGetUserData(gw);
for ( mi = mi->sub; mi->ti.text!=NULL || mi->ti.line ; ++mi ) {
@@ -1964,7 +1964,7 @@ static void edlistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) {
}
}
-static void ellistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) {
+static void edlistcheck(GWindow gw,struct gmenuitem *mi,GEvent *e) {
BitmapView *bv = (BitmapView *) GDrawGetUserData(gw);
for ( mi = mi->sub; mi->ti.text!=NULL || mi->ti.line ; ++mi ) {
diff --git a/fontforge/cvundoes.c b/fontforge/cvundoes.c
index c0c59d9f..c6070d9a 100644
--- a/fontforge/cvundoes.c
+++ b/fontforge/cvundoes.c
@@ -1616,6 +1616,7 @@ return( cur->undotype==ut_state || cur->undotype==ut_tstate ||
cur->undotype==ut_width || cur->undotype==ut_vwidth ||
cur->undotype==ut_lbearing || cur->undotype==ut_rbearing ||
cur->undotype==ut_hints ||
+ cur->undotype==ut_bitmap || cur->undotype==ut_bitmapsel ||
cur->undotype==ut_anchors || cur->undotype==ut_noop );
}
diff --git a/fontforge/stamp.c b/fontforge/stamp.c
index 757b680d..38fd471e 100644
--- a/fontforge/stamp.c
+++ b/fontforge/stamp.c
@@ -1,5 +1,5 @@
#include <time.h>
-const time_t source_modtime = 1295599427L;
-const char *source_modtime_str = "08:43 GMT 21-Jan-2011";
+const time_t source_modtime = 1295604041L;
+const char *source_modtime_str = "10:00 GMT 21-Jan-2011";
const char *source_version_str = "20110121";