solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Revert "Merge branch 'ak_high_dpi' of https://github.com/kosh543/wxWidgets"

Browse source 
This reverts commit a34ab31453, reversing
changes made to 783df59e66.

Undo the addition of wxBitmapBundle support to XRC, as it is finally
going to be done in a different way soon -- but for now just remove it
to ensure that nobody starts using it before it's finalized.

See #2633.

Closes #22014.
This commit is contained in:
Vadim Zeitlin 2022-01-13 18:54:15 +01:00
parent 68e2684d2b
commit 2064526e3d
9 changed files with 18 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

35
misc/schema/xrc_schema.rnc
View file

@ -469,14 +469,6 @@ t_bitmap = t_url?,
attribute stock_client { t_identifier}?
)?
t_bitmaps = (
element bitmap {_, t_bitmap }+ |
(
element svg {_, t_url } &
element size {_, t_size }
)
)
t_font = (
[xrc:p="o"] element size {_, t_float }* &
[xrc:p="o"] element style {_, ("normal" | "italic" | "slant") }* &
@ -742,10 +734,7 @@ wxButton =
stdObjectNodeAttributes &
stdWindowProperties &
[xrc:p="o"] element label {_, t_text }* &
[xrc:p="o"](
element bitmap {_, t_bitmap } |
element bitmaps {_, t_bitmaps }
)* &
[xrc:p="o"] element bitmap {_, t_bitmap }* &
[xrc:p="o"] element bitmapposition {_, t_direction }* &
[xrc:p="o"] element default {_, t_bool }*
}
@ -827,10 +816,7 @@ wxCommandLinkButton =
stdWindowProperties &
[xrc:p="important"] element label {_, t_text }* &
[xrc:p="o"] element note {_, t_text }* &
[xrc:p="o"](
element bitmap {_, t_bitmap } |
element bitmaps {_, t_bitmaps }
)* &
[xrc:p="o"] element bitmap {_, t_bitmap }* &
[xrc:p="o"] element default {_, t_bool }*
}
@ -1562,10 +1548,7 @@ wxStaticBitmap =
attribute class { "wxStaticBitmap" } &
stdObjectNodeAttributes &
stdWindowProperties &
(
element bitmap {_, t_bitmap } |
element bitmaps {_, t_bitmaps }
)
element bitmap {_, t_bitmap }
}
@ -1650,16 +1633,8 @@ wxToolBar_tool =
element object {
attribute class { "tool" } &
stdObjectNodeAttributes &
(
(
[xrc:p="important"] element bitmap {_, t_bitmap }* &
[xrc:p="o"] element bitmap2 {_, t_bitmap }*
) |
(
[xrc:p="important"] element bitmaps {_, t_bitmaps }* &
[xrc:p="o"] element bitmaps2 {_, t_bitmaps }*
)
) &
[xrc:p="important"] element bitmap {_, t_bitmap }* &
[xrc:p="o"] element bitmap2 {_, t_bitmap }* &
[xrc:p="o"] element label {_, t_text }* &
[xrc:p="o"] element tooltip {_, t_text }* &
[xrc:p="o"] element longhelp {_, t_text }* &