Merge branch 'propgrid-xrc'

Add support for loading wxPropertyGrid from XRC. See #24274.
2024-02-09 17:20:22 +01:00 · 2024-02-09 17:20:22 +01:00 · 33ef342dcc
commit 33ef342dcc
parent 21255ee197 f6a1b1a18a
33 changed files with 1122 additions and 244 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@ -3055,6 +3055,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/propgrid/propgridiface.cpp
    src/propgrid/propgridpagestate.cpp
    src/propgrid/props.cpp
+    src/xrc/xh_propgrid.cpp
 </set>
 <set var="PROPGRID_HDR" hints="files">
    wx/propgrid/advprops.h
@ -3067,6 +3068,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/propgrid/propgridpagestate.h
    wx/propgrid/props.h
    wx/propgrid/private.h
+    wx/xrc/xh_propgrid.h
 </set>

 <!-- ====================================================================== -->
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@ -2848,6 +2848,7 @@ set(PROPGRID_SRC
    src/propgrid/propgridiface.cpp
    src/propgrid/propgridpagestate.cpp
    src/propgrid/props.cpp
+    src/xrc/xh_propgrid.cpp
 )

 set(PROPGRID_HDR
@ -2861,6 +2862,7 @@ set(PROPGRID_HDR
    wx/propgrid/propgridpagestate.h
    wx/propgrid/props.h
    wx/propgrid/private.h
+    wx/xrc/xh_propgrid.h
 )

 set(RICHTEXT_SRC
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@ -115,7 +115,7 @@ wx_add_sample(power)
 wx_add_sample(preferences DEPENDS wxUSE_PREFERENCES_EDITOR)
 wx_add_sample(printing printing.cpp printing.h DEPENDS wxUSE_PRINTING_ARCHITECTURE)
 wx_add_sample(propgrid propgrid.cpp propgrid_minimal.cpp sampleprops.cpp
-    sampleprops.h propgrid.h LIBRARIES wxpropgrid NAME propgriddemo DEPENDS wxUSE_PROPGRID)
+    sampleprops.h propgrid.h LIBRARIES wxpropgrid wxxrc NAME propgriddemo DEPENDS wxUSE_PROPGRID)
 wx_add_sample(render FOLDER render)
 wx_add_sample(render DLL renddll.cpp NAME renddll FOLDER render)
 wx_add_sample(ribbon ribbondemo.cpp LIBRARIES wxribbon NAME ribbondemo DEPENDS wxUSE_RIBBON)
--- a/build/files
+++ b/build/files
@ -2775,6 +2775,7 @@ PROPGRID_SRC =
    src/propgrid/propgridiface.cpp
    src/propgrid/propgridpagestate.cpp
    src/propgrid/props.cpp
+    src/xrc/xh_propgrid.cpp
 PROPGRID_HDR =
    wx/propgrid/advprops.h
    wx/propgrid/editors.h
@ -2786,6 +2787,7 @@ PROPGRID_HDR =
    wx/propgrid/propgridpagestate.h
    wx/propgrid/props.h
    wx/propgrid/private.h
+    wx/xrc/xh_propgrid.h

 # wxRichTextCtrl

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@ -1534,7 +1534,8 @@ PROPGRIDDLL_OBJECTS =  \
 	$(OBJS)\propgriddll_propgrid.o \
 	$(OBJS)\propgriddll_propgridiface.o \
 	$(OBJS)\propgriddll_propgridpagestate.o \
-	$(OBJS)\propgriddll_props.o
+	$(OBJS)\propgriddll_props.o \
+	$(OBJS)\propgriddll_xh_propgrid.o
 PROPGRIDLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \
 	-I..\..\src\png -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx \
 	-I..\..\src\expat\expat\lib $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@ -1552,7 +1553,8 @@ PROPGRIDLIB_OBJECTS =  \
 	$(OBJS)\propgridlib_propgrid.o \
 	$(OBJS)\propgridlib_propgridiface.o \
 	$(OBJS)\propgridlib_propgridpagestate.o \
-	$(OBJS)\propgridlib_props.o
+	$(OBJS)\propgridlib_props.o \
+	$(OBJS)\propgridlib_xh_propgrid.o
 RICHTEXTDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg \
 	-I..\..\src\png -I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx \
 	-I..\..\src\expat\expat\lib $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
@ -1850,6 +1852,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_propgridiface.o \
 	$(OBJS)\monodll_propgridpagestate.o \
 	$(OBJS)\monodll_props.o \
+	$(OBJS)\monodll_xh_propgrid.o \
 	$(OBJS)\monodll_art_internal.o \
 	$(OBJS)\monodll_art_msw.o \
 	$(OBJS)\monodll_art_aui.o \
@ -2706,6 +2709,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_propgridiface.o \
 	$(OBJS)\monolib_propgridpagestate.o \
 	$(OBJS)\monolib_props.o \
+	$(OBJS)\monolib_xh_propgrid.o \
 	$(OBJS)\monolib_art_internal.o \
 	$(OBJS)\monolib_art_msw.o \
 	$(OBJS)\monolib_art_aui.o \
@ -8096,6 +8100,9 @@ $(OBJS)\monodll_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp
 $(OBJS)\monodll_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_xh_propgrid.o: ../../src/xrc/xh_propgrid.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_art_internal.o: ../../src/ribbon/art_internal.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@ -10693,6 +10700,9 @@ $(OBJS)\monolib_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp
 $(OBJS)\monolib_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_xh_propgrid.o: ../../src/xrc/xh_propgrid.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_art_internal.o: ../../src/ribbon/art_internal.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@ -17395,6 +17405,9 @@ $(OBJS)\propgriddll_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cp
 $(OBJS)\propgriddll_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\propgriddll_xh_propgrid.o: ../../src/xrc/xh_propgrid.cpp
+	$(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\propgridlib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $<

@ -17422,6 +17435,9 @@ $(OBJS)\propgridlib_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cp
 $(OBJS)\propgridlib_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\propgridlib_xh_propgrid.o: ../../src/xrc/xh_propgrid.cpp
+	$(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@ -1707,7 +1707,8 @@ PROPGRIDDLL_OBJECTS =  \
 	$(OBJS)\propgriddll_propgrid.obj \
 	$(OBJS)\propgriddll_propgridiface.obj \
 	$(OBJS)\propgriddll_propgridpagestate.obj \
-	$(OBJS)\propgriddll_props.obj
+	$(OBJS)\propgriddll_props.obj \
+	$(OBJS)\propgriddll_xh_propgrid.obj
 PROPGRIDDLL_RESOURCES =  \
 	$(OBJS)\propgriddll_version.res
 PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_549)$(__DEBUGRUNTIME) /DWIN32 \
@ -1731,7 +1732,8 @@ PROPGRIDLIB_OBJECTS =  \
 	$(OBJS)\propgridlib_propgrid.obj \
 	$(OBJS)\propgridlib_propgridiface.obj \
 	$(OBJS)\propgridlib_propgridpagestate.obj \
-	$(OBJS)\propgridlib_props.obj
+	$(OBJS)\propgridlib_props.obj \
+	$(OBJS)\propgridlib_xh_propgrid.obj
 RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \
 	/I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
 	/I..\..\3rdparty\pcre\src\wx /I..\..\src\expat\expat\lib $(__DEBUGINFO) \
@ -2196,6 +2198,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_propgridiface.obj \
 	$(OBJS)\monodll_propgridpagestate.obj \
 	$(OBJS)\monodll_props.obj \
+	$(OBJS)\monodll_xh_propgrid.obj \
 	$(OBJS)\monodll_art_internal.obj \
 	$(OBJS)\monodll_art_msw.obj \
 	$(OBJS)\monodll_art_aui.obj \
@ -3052,6 +3055,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_propgridiface.obj \
 	$(OBJS)\monolib_propgridpagestate.obj \
 	$(OBJS)\monolib_props.obj \
+	$(OBJS)\monolib_xh_propgrid.obj \
 	$(OBJS)\monolib_art_internal.obj \
 	$(OBJS)\monolib_art_msw.obj \
 	$(OBJS)\monolib_art_aui.obj \
@ -8565,6 +8569,9 @@ $(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp

+$(OBJS)\monodll_xh_propgrid.obj: ..\..\src\xrc\xh_propgrid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propgrid.cpp
+
 $(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp

@ -11162,6 +11169,9 @@ $(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp

+$(OBJS)\monolib_xh_propgrid.obj: ..\..\src\xrc\xh_propgrid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propgrid.cpp
+
 $(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp

@ -17864,6 +17874,9 @@ $(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.
 $(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp

+$(OBJS)\propgriddll_xh_propgrid.obj: ..\..\src\xrc\xh_propgrid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\xrc\xh_propgrid.cpp
+
 $(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

@ -17891,6 +17904,9 @@ $(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.
 $(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp

+$(OBJS)\propgridlib_xh_propgrid.obj: ..\..\src\xrc\xh_propgrid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\xrc\xh_propgrid.cpp
+
 $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

--- a/build/msw/wx_propgrid.vcxproj
+++ b/build/msw/wx_propgrid.vcxproj
@ -464,6 +464,7 @@
    <ClCompile Include="..\..\src\propgrid\propgridiface.cpp" />
    <ClCompile Include="..\..\src\propgrid\propgridpagestate.cpp" />
    <ClCompile Include="..\..\src\propgrid\props.cpp" />
+    <ClCompile Include="..\..\src\xrc\xh_propgrid.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\..\src\msw\version.rc">
@ -504,6 +505,7 @@
    <ClInclude Include="..\..\include\wx\propgrid\propgridpagestate.h" />
    <ClInclude Include="..\..\include\wx\propgrid\props.h" />
    <ClInclude Include="..\..\include\wx\propgrid\private.h" />
+    <ClInclude Include="..\..\include\wx\xrc\xh_propgrid.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/msw/wx_propgrid.vcxproj.filters
+++ b/build/msw/wx_propgrid.vcxproj.filters
@ -49,6 +49,9 @@
    <ClCompile Include="..\..\src\propgrid\props.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_propgrid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\..\src\msw\version.rc">
@ -65,6 +68,9 @@
    <ClInclude Include="..\..\include\wx\propgrid\manager.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\wx\propgrid\private.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\wx\propgrid\property.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
@ -83,7 +89,7 @@
    <ClInclude Include="..\..\include\wx\propgrid\props.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\wx\propgrid\private.h">
+    <ClInclude Include="..\..\include\wx\xrc\xh_propgrid.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
  </ItemGroup>