Opened 8 months ago

Closed 7 months ago

Last modified 7 months ago

#16183 closed defect (fixed)

wxLANGUAGE_USER_DEFINED broken since rev 75587

Reported by: StepanHrbek Owned by: vadz
Priority: normal Milestone:
Component: base Version: dev-latest
Keywords: Cc:
Blocked By: Blocking:
Patch: no

Description

language.h in trunk contains:

wxLANGUAGE_ZULU,
wxLANGUAGE_CAMBODIAN = wxLANGUAGE_KHMER,
wxLANGUAGE_USER_DEFINED

so that ZULU=234, CAMBODIAN=119, USER_DEFINED=120.

It can be fixed by moving USER_DEFINED above CAMBODIAN.

Change History (5)

comment:1 Changed 7 months ago by SN

  • Owner set to SN
  • Resolution set to fixed
  • Status changed from new to closed

In 76368:

Fixed wxLANGUAGE_USER_DEFINED, which is supposed to be the last element of
the enum, but as such must still be given, before messing with the automatic
internal counter of enum by defining synonyms. Fixes #16183.

comment:2 follow-up: Changed 7 months ago by disc

  • Resolution fixed deleted
  • Status changed from closed to reopened

This should be fixed through misc/languages/genlang.py and not in the generated include/wx/language.h (see misc/languages/README for some more details). See also https://groups.google.com/forum/#!topic/wx-dev/j0r7JAPygUU for an alternative fix, though either would work.

comment:3 Changed 7 months ago by vadz

  • Owner changed from SN to vadz
  • Status changed from reopened to accepted

I'd also prefer your fix, but it is non-trivial to implement as it would require doing changes in the middle of the generated data, so I'll just use the same fix as in r76368 but will update the script to produce it.

comment:4 Changed 7 months ago by VZ

  • Resolution set to fixed
  • Status changed from accepted to closed

In 76379:

Handle wxLANGUAGE_CAMBODIAN correctly in the generation script.

Fix wxLANGUAGE_CAMBODIAN definition in autogenerated code, this was already
done manually in r76368 but these changes would have been lost after the next
generation, so update the script itself to generate them.

Closes #16183.

comment:5 in reply to: ↑ 2 Changed 7 months ago by neis

Replying to disc:

This should be fixed through misc/languages/genlang.py and not in the generated include/wx/language.h.

Sorry for missing the fact that the file is auto-generated... :-(

Note: See TracTickets for help on using tickets.