windows/win.c : add missing styles

Dmitry Timoshkov dmitry at baikal.ru
Wed Dec 8 00:15:51 CST 2004


"Rémi Assailly" <remi.assailly at free.fr> wrote:

> --- windows/win.c~ 2004-11-29 18:35:46.000000000 +0100
> +++ windows/win.c 2004-12-07 18:04:02.135332008 +0100
> @@ -872,7 +872,6 @@
>      if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX");
>      if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX");
>
> -    /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */

Don't remove this line, your patch doesn't add dumping of those styles.

>  #define DUMPED_STYLES \
>      (WS_POPUP | \
>       WS_CHILD | \
> @@ -882,6 +881,7 @@
>       WS_CLIPSIBLINGS | \
>       WS_CLIPCHILDREN | \
>       WS_MAXIMIZE | \
> +     WS_CAPTION | \

This isn't a style you want to add here.

>       WS_BORDER | \
>       WS_DLGFRAME | \
>       WS_VSCROLL | \
> @@ -891,7 +891,94 @@
>       WS_GROUP | \
>       WS_TABSTOP | \
>       WS_MINIMIZEBOX | \
> -     WS_MAXIMIZEBOX)
> +     WS_MAXIMIZEBOX | \
> +     BS_DEFPUSHBUTTON | \
> +     BS_CHECKBOX | \
> +     BS_AUTOCHECKBOX | \
> +     BS_AUTOCHECKBOX | \
> +     BS_3STATE | \
> +     BS_AUTO3STATE | \
> +     BS_GROUPBOX | \
> +     BS_USERBUTTON | \
> +     BS_AUTORADIOBUTTON | \
> +     BS_OWNERDRAW | \
> +     BS_LEFTTEXT | \
> +     BS_ICON | \
> +     BS_BITMAP | \
> +     BS_LEFT | \
> +     BS_RIGHT | \
> +     BS_CENTER | \
> +     BS_TOP | \
> +     BS_BOTTOM | \
> +     BS_VCENTER | \
> +     BS_PUSHLIKE | \
> +     BS_MULTILINE | \
> +     BS_NOTIFY | \
> +     BS_FLAT | \
> +     ES_CENTER | \
> +     ES_RIGHT | \
> +     ES_MULTILINE | \
> +     ES_UPPERCASE | \
> +     ES_LOWERCASE | \
> +     ES_PASSWORD | \
> +     ES_AUTOVSCROLL | \
> +     ES_AUTOHSCROLL | \
> +     ES_NOHIDESEL | \
> +     ES_COMBO | \
> +     ES_OEMCONVERT | \
> +     ES_READONLY | \
> +     ES_WANTRETURN | \
> +     ES_NUMBER | \
> +     SBS_VERT | \
> +     SBS_TOPALIGN | \
> +     SBS_LEFTALIGN | \
> +     SBS_BOTTOMALIGN | \
> +     SBS_RIGHTALIGN | \
> +     SBS_SIZEBOXTOPLEFTALIGN | \
> +     SBS_SIZEBOXBOTTOMRIGHTALIGN | \
> +     SBS_SIZEBOX | \
> +     SBS_SIZEGRIP | \
> +     LBS_NOSEL | \
> +     LBS_COMBOBOX | \
> +     LBS_STANDARD | \
> +     CBS_SIMPLE | \
> +     CBS_DROPDOWN | \
> +     CBS_DROPDOWNLIST | \
> +     CBS_OWNERDRAWFIXED | \
> +     CBS_OWNERDRAWVARIABLE | \
> +     CBS_AUTOHSCROLL | \
> +     CBS_OEMCONVERT | \
> +     CBS_SORT | \
> +     CBS_HASSTRINGS | \
> +     CBS_NOINTEGRALHEIGHT | \
> +     CBS_DISABLENOSCROLL | \
> +     CBS_UPPERCASE | \
> +     CBS_LOWERCASE | \
> +     DS_ABSALIGN | \
> +     DS_SYSMODAL | \
> +     DS_3DLOOK | \
> +     DS_FIXEDSYS | \
> +     DS_NOFAILCREATE | \
> +     DS_LOCALEDIT | \
> +     DS_SETFONT | \
> +     DS_MODALFRAME | \
> +     DS_NOIDLEMSG | \
> +     DS_SETFOREGROUND | \
> +     DS_CONTROL | \
> +     DS_CENTER | \
> +     DS_CENTERMOUSE | \
> +     DS_CONTEXTHELP | \
> +     SS_USERITEM | \
> +     SS_LEFTNOWORDWRAP | \
> +     SS_OWNERDRAW | \
> +     SS_BITMAP | \
> +     SS_ENHMETAFILE | \
> +     SS_ETCHEDHORZ | \
> +     SS_ETCHEDVERT | \
> +     SS_ETCHEDFRAME | \
> +     SS_TYPEMASK | \
> +     SS_WORDELLIPSIS | \
> +     SS_ELLIPSISMASK)

And where do you dump all the above listed styles? (Just a hint: you
can't dump them without looking at the class name, and it won't work
for superclassed windows).

--
Dmitry.





More information about the wine-devel mailing list