pkgsrc/graphics/xpaint/patches/patch-ai

74 lines
2.7 KiB
Text

$NetBSD: patch-ai,v 1.2 2011/07/14 09:52:59 shattered Exp $
--- graphic.c.orig 2005-09-02 21:31:56.000000000 +0000
+++ graphic.c
@@ -33,7 +33,7 @@
#include "xaw_incdir/SmeBSB.h"
#include "xaw_incdir/Paned.h"
-//#include <X11/keysym.h>
+/*#include <X11/keysym.h>*/
#include <xpm.h>
#ifdef HAVE_COLTOG
@@ -119,7 +119,8 @@ static char *fontNames[] = {
"-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Lucida 12 */
"-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica 12 */
"-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica Bold 12 */
-"-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*", /* Fixed 12 */
+"-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1", /* Sony 16 */
+"-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1", /* Sony 24 */
"-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*" /* Courier 12 */
};
@@ -262,8 +263,9 @@ static PaintMenuItem fontMenu[] =
MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
MI_SEPARATOR(),
MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
};
@@ -515,8 +517,9 @@ static PaintMenuItem popupFontMenu[] =
MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
MI_SEPARATOR(),
MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
};
@@ -3606,7 +3609,7 @@ graphicCreate(Widget shell, int width, i
#endif
}
}
- //checkPaintDimension(shell);
+ /*checkPaintDimension(shell);*/
return paint;
}
@@ -4145,7 +4148,7 @@ stdPasteCB(Widget paint, XtPointer infoA
PwRegionSet(paint, &rect, pix, newMask);
}
- // setToSelectOp();
+ /* setToSelectOp();*/
}
void
@@ -4282,7 +4285,7 @@ StdSelectAllCallback(Widget w, XtPointer
rect.height = dh;
PwRegionSet(paint, &rect, None, None);
- // setToSelectOp();
+ /* setToSelectOp(); */
}
void