Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-28 03:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ak_bmpcmb_xrc' of https://github.com/kosh543/wxWidgets

Browse Source 
Use wxBitmapBundle in wxBitmapComboBox XRC handler.

See #22111.
This commit is contained in:
Vadim Zeitlin
2022-02-09 14:24:16 +01:00
parent 360691aa8e e5e93bba22
commit eaa769a73a
10 changed files with 175 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/xrc/Makefile.in
+1 -1
View File
@@ -204,7 +204,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
data:
@mkdir -p ./rc
@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \
@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \
if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
then x=yep ; \
else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
samples/xrc/makefile.gcc
+1 -1
View File
@@ -246,7 +246,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %%f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
for %%f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc
$(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --define wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST) --include-dir ./../../samples --define NOPCH
samples/xrc/makefile.vc
+1 -1
View File
@@ -455,7 +455,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
for %f in (aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1) $(__TARGET_CPU_COMPFLAG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
samples/xrc/rc/basicdlg2.xpm
+40
View File
@@ -0,0 +1,40 @@
/* XPM */
static const char *const basicdlg_xpm[] = {
"32 32 5 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #0000FF",
"# c #FFFFFF",
" ",
" ",
"................................",
"................................",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++########################++..",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"................................",
"................................",
" ",
" "};
samples/xrc/rc/controls.xrc
+4 -4
View File
@@ -426,19 +426,19 @@ lay them out using wxSizers, absolute positioning, everything you like!
<selection>2</selection>
<object class="ownerdrawnitem">
<text>This is a</text>
<bitmap>basicdlg.xpm</bitmap>
<bitmap>basicdlg.xpm;basicdlg2.xpm</bitmap>
</object>
<object class="ownerdrawnitem">
<text>read-only</text>
<bitmap>derivdlg.xpm</bitmap>
<bitmap>derivdlg.xpm;derivdlg2.xpm</bitmap>
</object>
<object class="ownerdrawnitem">
<text>wxBitmapComboBox</text>
<bitmap>uncenter.xpm</bitmap>
<bitmap>uncenter.xpm;uncenter2.xpm</bitmap>
</object>
<object class="ownerdrawnitem">
<text>control</text>
<bitmap>custclas.xpm</bitmap>
<bitmap>custclas.xpm;custclas2.xpm</bitmap>
</object>
</object>
</object>
samples/xrc/rc/custclas2.xpm
+42
View File
@@ -0,0 +1,42 @@
/* XPM */
static const char *const custclas_xpm[] = {
"32 32 7 1",
" c None",
". c #EBF70E",
"+ c #000000",
"@ c #808080",
"# c #0000FF",
"$ c #FFFFFF",
"% c #0E2CEF",
" ",
" ",
" .. ",
" .. ",
" .. ",
" .. ",
" .. .. .. ",
" .. .. .. ",
" ...... ",
" ...... ",
"......++........++++++++++++++++",
"......++........++++++++++++++++",
"++@@......@@@@@@@@@@@@@@@@@@@@++",
"++@@......@@@@@@@@@@@@@@@@@@@@++",
"++..##..##..########$$$$$$$$@@++",
"++..##..##..########$$$$$$$$@@++",
"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
"++@@%%..%%%%%%%%%%%%$$$$$$$$@@++",
"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
"++++++++++++++++++++++++++++++++",
"++++++++++++++++++++++++++++++++",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
samples/xrc/rc/derivdlg2.xpm
+41
View File
@@ -0,0 +1,41 @@
/* XPM */
static const char *const derivdlg_xpm[] = {
"32 32 6 1",
" c None",
". c #EBF70E",
"+ c #000000",
"@ c #808080",
"# c #0000FF",
"$ c #FFFFFF",
" .. ",
" .. ",
"++++++..++++++++++++++++++++++++",
"++++++..++++++++++++++++++++++++",
"++..@@..@@..@@@@@@@@@@@@@@@@@@++",
"++..@@..@@..@@@@@@@@@@@@@@@@@@++",
"++@@......##################@@++",
"++@@......##################@@++",
"......@@........@@@@@@@@@@@@@@++",
"......@@........@@@@@@@@@@@@@@++",
"++@@......$$$$$$$$$$$$$$$$$$@@++",
"++@@......$$$$$$$$$$$$$$$$$$@@++",
"++..$$..@@..@@@@@@@@@@@@$$$$@@++",
"++..$$..@@..@@@@@@@@@@@@$$$$@@++",
"++@@$$..@@@@@@@@@@@@@@@@$$$$@@++",
"++@@$$..@@@@@@@@@@@@@@@@$$$$@@++",
"++@@$$..$$$$$$$$$$$$$$$$$$$$@@++",
"++@@$$..$$$$$$$$$$$$$$$$$$$$@@++",
"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
"++@@$$$$$$$$@@@@@@@@$$$$$$$$@@++",
"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
"++@@$$$$$$$$$$$$$$$$$$$$$$$$@@++",
"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
"++@@@@@@@@@@@@@@@@@@@@@@@@@@@@++",
"++++++++++++++++++++++++++++++++",
"++++++++++++++++++++++++++++++++",
" ",
" "};
samples/xrc/rc/uncenter2.xpm
+40
View File
@@ -0,0 +1,40 @@
/* XPM */
static const char *const uncenter_xpm[] = {
"32 32 5 1",
" c None",
". c #000000",
"+ c #808080",
"@ c #0000FF",
"# c #FFFFFF",
" ",
" ",
"................................",
"................................",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
"..++@@@@@@@@@@@@@@@@@@@@@@@@++..",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"..++########################++..",
"..++########################++..",
"..++######........##########++..",
"..++######........##########++..",
"..++######....##############++..",
"..++######....##############++..",
"..++######..##..############++..",
"..++######..##..############++..",
"..++######..####..##########++..",
"..++######..####..##########++..",
"..++##############..########++..",
"..++##############..########++..",
"..++################..######++..",
"..++################..######++..",
"..++########################++..",
"..++########################++..",
"..++++++++++++++++++++++++++++..",
"..++++++++++++++++++++++++++++..",
"................................",
"................................",
" ",
" "};
samples/xrc/xrcdemo.bkl
+4 -4
View File
@@ -32,11 +32,11 @@
<srcdir>$(SRCDIR)/rc</srcdir>
<files>
aui.xpm aui.xrc
artprov.xpm artprov.xrc basicdlg.xpm
basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
artprov.xpm artprov.xrc basicdlg.xpm basicdlg2.xpm
basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas2.xpm custclas.xrc
derivdlg.xpm derivdlg2.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif
resource.xrc toolbar.xrc uncenter.xpm
resource.xrc toolbar.xrc uncenter.xpm uncenter2.xpm
objref.xrc objrefdlg.xpm
uncenter.xrc update.gif
variable.xpm variable.xrc
src/xrc/xh_bmpcbox.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ wxObject *wxBitmapComboBoxXmlHandler::DoCreateResource()
}
m_combobox->Append(GetText(wxT("text")),
GetBitmap(wxT("bitmap")));
GetBitmapBundle(wxT("bitmap")));
return m_combobox;
}