Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/user32/menu.c

    r21356 r21916  
    757757    if (id && IS_MAGIC_ITEM( id ))
    758758    {
    759         switch(LOWORD(id))
     759        switch((HBITMAP)LOWORD(id))
    760760        {
    761761        case HBMMENU_SYSTEM:
    … …  
    813813        RECT r;
    814814
    815         switch(LOWORD(lpitem->text))
     815        switch((HBITMAP)LOWORD(lpitem->text))
    816816        {
    817817        case HBMMENU_SYSTEM:
Note: See TracChangeset for help on using the changeset viewer.