tools/wrx/parser.y - fix BS_OWNERDRAW so it override all other button styles

Michael Lin mlin at corvu.com.au
Mon Mar 28 18:02:06 CST 2005


AUTO3STATE control with BS_OWNERDRAW set will not get created.

On windows,
AUTO3STATE control with BS_OWNERDRAW will have BS_OWNERDRAW button style.
AUTO3STATE control without BS_OWNERDRAW will have BS_AUTO3STATE button 
style.
BS_OWNERDRAW will overrides all other button style.

ChangeLog:
* fix BS_OWNERDRAW so it override all other button styles.


-------------- next part --------------
Index: tools/wrc/parser.y
===================================================================
RCS file: /home/wine/wine/tools/wrc/parser.y,v
retrieving revision 1.49
diff -u -r1.49 parser.y
--- tools/wrc/parser.y	8 Mar 2005 19:09:16 -0000	1.49
+++ tools/wrc/parser.y	23 Mar 2005 00:19:16 -0000
@@ -2062,7 +2062,11 @@
 
 	if (!ctrl->gotstyle)
 		ctrl->style = new_style(0,0);
-
+	
+	/* BS_OWNERDRAW overrides any other button style */
+	if (type == CT_BUTTON && (ctrl->style->or_mask & BS_OWNERDRAW) == BS_OWNERDRAW)
+		special_style = BS_PUSHBUTTON;
+	
 	/* combine all styles */
 	ctrl->style->or_mask = ctrl->style->or_mask | defaultstyle | special_style;
 	ctrl->gotstyle = TRUE;


More information about the wine-patches mailing list