diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/xwin/winprefsyacc.y | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winprefsyacc.y')
| -rw-r--r-- | xorg-server/hw/xwin/winprefsyacc.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y index c917d04ff..0c2775192 100644 --- a/xorg-server/hw/xwin/winprefsyacc.y +++ b/xorg-server/hw/xwin/winprefsyacc.y @@ -173,18 +173,18 @@ icons: ICONS LB {OpenIcons();} newline_or_nada iconlist RB {CloseIcons();} group1: TOPMOST { $$=STYLE_TOPMOST; } | MAXIMIZE { $$=STYLE_MAXIMIZE; } | MINIMIZE { $$=STYLE_MINIMIZE; } - | BOTTOM { $$=STYLE_BOTTOM; } + | BOTTOM { $$=STYLE_BOTTOM; } ; group2: NOTITLE { $$=STYLE_NOTITLE; } - | OUTLINE { $$=STYLE_OUTLINE; } + | OUTLINE { $$=STYLE_OUTLINE; } | NOFRAME { $$=STYLE_NOFRAME; } ; stylecombo: group1 { $$=$1; } | group2 { $$=$1; } - | group1 group2 { $$=$1+$2; } - | group2 group1 { $$=$1+$2; } + | group1 group2 { $$=$1|$2; } + | group2 group1 { $$=$1|$2; } ; styleline: STRING stylecombo NEWLINE newline_or_nada { AddStyleLine($1, $2); free($1); } |