[Perl-win32-gui-cvscommit] Win32-GUI CHANGELOG, 1.109, 1.110 Combobox.xs, 1.8, 1.9 GUI.pm, 1.61, 1.62

[Robert M. <rob...@us...>]

Update of /cvsroot/perl-win32-gui/Win32-GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31882

Modified Files:
	CHANGELOG Combobox.xs GUI.pm 
Log Message:
Fix interaction of 'simple', 'dropdown' and 'dropdownlist' options to combobox

Index: Combobox.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Combobox.xs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Combobox.xs	31 Oct 2006 22:24:15 -0000	1.8
--- Combobox.xs	15 Jul 2007 18:23:06 -0000	1.9
***************
*** 24,36 ****
             if BitmaskOptionValue("-autohscroll",       perlcs->cs.style, CBS_AUTOHSCROLL)
      } else if BitmaskOptionValue("-disablenoscroll",   perlcs->cs.style, CBS_DISABLENOSCROLL)
-     } else if BitmaskOptionValue("-dropdown",          perlcs->cs.style, CBS_DROPDOWN)
-     } else if BitmaskOptionValue("-dropdownlist",      perlcs->cs.style, CBS_DROPDOWNLIST)
      } else if BitmaskOptionValue("-hasstring",         perlcs->cs.style, CBS_HASSTRINGS)
      } else if BitmaskOptionValue("-lowercase",         perlcs->cs.style, CBS_LOWERCASE)
      } else if BitmaskOptionValue("-nointegraleheight", perlcs->cs.style, CBS_NOINTEGRALHEIGHT)
-     } else if BitmaskOptionValue("-simple",            perlcs->cs.style, CBS_SIMPLE)
      } else if BitmaskOptionValue("-sort",              perlcs->cs.style, CBS_SORT)
      } else if BitmaskOptionValue("-uppercase",         perlcs->cs.style, CBS_UPPERCASE)
!     } else retval = FALSE;
  
      return retval;
--- 24,46 ----
             if BitmaskOptionValue("-autohscroll",       perlcs->cs.style, CBS_AUTOHSCROLL)
      } else if BitmaskOptionValue("-disablenoscroll",   perlcs->cs.style, CBS_DISABLENOSCROLL)
      } else if BitmaskOptionValue("-hasstring",         perlcs->cs.style, CBS_HASSTRINGS)
      } else if BitmaskOptionValue("-lowercase",         perlcs->cs.style, CBS_LOWERCASE)
      } else if BitmaskOptionValue("-nointegraleheight", perlcs->cs.style, CBS_NOINTEGRALHEIGHT)
      } else if BitmaskOptionValue("-sort",              perlcs->cs.style, CBS_SORT)
      } else if BitmaskOptionValue("-uppercase",         perlcs->cs.style, CBS_UPPERCASE)
!     }
!     else if(strcmp(option, "-simple") == 0) {
!         perlcs->cs.style &= ~CBS_DROPDOWNLIST;
!         perlcs->cs.style |=  CBS_SIMPLE;
!     }
!     else if(strcmp(option, "-dropdown") == 0) {
!         perlcs->cs.style &= ~CBS_DROPDOWNLIST;
!         perlcs->cs.style |=  CBS_DROPDOWN;
!     }
!     else if(strcmp(option, "-dropdownlist") == 0) {
!         perlcs->cs.style |=  CBS_DROPDOWNLIST;
!     }
!     else
!         retval = FALSE;
  
      return retval;

Index: GUI.pm
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** GUI.pm	15 Jul 2007 18:16:20 -0000	1.61
--- GUI.pm	15 Jul 2007 18:23:06 -0000	1.62
***************
*** 1601,1604 ****
--- 1601,1607 ----
      #  -uppercase => 0/1 (default 0)
      #    Set/Unset uppercase style
+     #
+     # Only one of -simple, -dropdown and -dropdownlist should be used. If
+     # more than one is used, only the last one will be acted on.
  
  sub new {

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** CHANGELOG	15 Jul 2007 18:16:20 -0000	1.109
--- CHANGELOG	15 Jul 2007 18:23:06 -0000	1.110
***************
*** 8,11 ****
--- 8,14 ----
  + [Robert May] : 15 July 2007 -  Bug Fixes
      - GUI.pm - fix bltr direction in Animate Window [Tim Hansell]
+     - Comboxbox.xs, GUI.pm - fix options so use of -simple, -dropdown and
+       -dropdownlist together have a more predictable result.
+       Update docs. [Glenn Linderman]
  
  + [Robert May] : 20 January 2007 - Restore Original WndProc