Skip to content

convert Cbdesign to wxWidgets AUI #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DLLarson merged 21 commits into from
Jun 21, 2025
Merged

convert Cbdesign to wxWidgets AUI #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2836862
wxWidgets: update
wsu-cb Apr 13, 2025
d220091
GP manifest: fix copy/paste error
wsu-cb Dec 13, 2024
ccc0185
fixup! VwBitedt: implement some simple message handlers
wsu-cb Mar 25, 2025
625b97a
fixup! VwBitedt: implement CBitTextTool
wsu-cb Mar 28, 2025
71d2100
fixup! VwEdtbrd: implement some simple event handlers
wsu-cb Mar 25, 2025
b867f54
prep for using wx AUI and doc template
wsu-cb Dec 19, 2024
d282333
FrmMain/VwPrjgbx: start replacing MFC windows w/ wx AUI
wsu-cb Dec 17, 2024
c28dce9
VwEdtbrd: convert to wx AUI and docview
wsu-cb Dec 19, 2024
30b6fe2
VwBitedt/VwTilesl: replace MFC with wx AUI
wsu-cb Dec 31, 2024
73fe941
CBDesign: convert toolbars and statusbar from MFC to wx AUI
wsu-cb Jan 25, 2025
2f7e555
LBoxVHScrl: implement wxWindow::GetBestSize()
wsu-cb Mar 1, 2025
0268483
PalColor/PalTile: convert MFC to wx AUI
wsu-cb Feb 13, 2025
c41ab47
PalColor: convert MFC message to wxWidgets event
wsu-cb Feb 20, 2025
c072801
FrmMain/PalColor: more MFC to wx conversion
wsu-cb Feb 22, 2025
d734075
GM: require toolbar/menu commands to be explicitly enabled
wsu-cb Mar 2, 2025
1a7137b
FrmMain: implement event handlers
wsu-cb Mar 7, 2025
3171cdf
CGmApp: convert message handlers and CAbout to wx
wsu-cb Mar 10, 2025
898543e
GM: remove dead code used during MFC to wx conversion
wsu-cb Mar 14, 2025
31b7c2b
CyberBoard.h: disable not-currently-used MFC adapters
wsu-cb Jan 26, 2025
cc665b0
CBDsgn32.vcxproj: update project settings
wsu-cb Apr 13, 2025
7552799
try to consistently use resource.h instead of sometimes Resource.h
wsu-cb Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,731 changes: 2,406 additions & 325 deletions GM/CBDesign.fbp
View file
Open in desktop

Large diffs are not rendered by default.

656 changes: 655 additions & 1 deletion GM/CBDesign.xrc
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions GM/CBDsgn32.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ echo off
<ShowProgress>false</ShowProgress>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxbase33ud.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_core.lib;wxmsw33ud_html.lib;wxmsw33ud_xrc.lib;wxpngd.lib;wxzlibd.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wxbase33ud.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_aui.lib;wxmsw33ud_core.lib;wxmsw33ud_html.lib;wxmsw33ud_xrc.lib;wxpngd.lib;wxzlibd.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -186,7 +186,7 @@ echo off
<ShowProgress>false</ShowProgress>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxbase33ud.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_core.lib;wxmsw33ud_html.lib;wxmsw33ud_xrc.lib;wxpngd.lib;wxzlibd.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wxbase33ud.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_aui.lib;wxmsw33ud_core.lib;wxmsw33ud_html.lib;wxmsw33ud_xrc.lib;wxpngd.lib;wxzlibd.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -237,7 +237,7 @@ echo off
<AdditionalIncludeDirectories>$(SolutionDir)deps\wxWidgets\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wxbase33u.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_core.lib;wxmsw33u_html.lib;wxmsw33u_xrc.lib;wxpng.lib;wxzlib.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wxbase33u.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_aui.lib;wxmsw33u_core.lib;wxmsw33u_html.lib;wxmsw33u_xrc.lib;wxpng.lib;wxzlib.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
Expand Down Expand Up @@ -292,7 +292,7 @@ echo off
<DataExecutionPrevention>
</DataExecutionPrevention>
<AdditionalLibraryDirectories>..\out\build\x64-Release\deps\wxWidgets\lib\vc_x64_lib</AdditionalLibraryDirectories>
<AdditionalDependencies>wxbase33u.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_core.lib;wxmsw33u_html.lib;wxmsw33u_xrc.lib;wxpng.lib;wxzlib.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wxbase33u.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_aui.lib;wxmsw33u_core.lib;wxmsw33u_html.lib;wxmsw33u_xrc.lib;wxpng.lib;wxzlib.lib;htmlhelp.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -333,10 +333,8 @@ echo off
<ClCompile Include="..\GShr\Font.cpp" />
<ClCompile Include="..\GShr\FontName.cpp" />
<ClCompile Include="FrmBited.cpp" />
<ClCompile Include="FrmBxdoc.cpp" />
<ClCompile Include="FrmDockTile.cpp" />
<ClCompile Include="FrmMain.cpp" />
<ClCompile Include="FrmView.cpp" />
<ClCompile Include="..\GShr\GdiTools.cpp" />
<ClCompile Include="Gm.cpp" />
<ClCompile Include="GmDoc.cpp" />
Expand Down Expand Up @@ -421,10 +419,8 @@ echo off
<ClInclude Include="..\GShr\Font.h" />
<ClInclude Include="..\GShr\FontName.h" />
<ClInclude Include="FrmBited.h" />
<ClInclude Include="FrmBxdoc.h" />
<ClInclude Include="FrmDockTile.h" />
<ClInclude Include="FrmMain.h" />
<ClInclude Include="FrmView.h" />
<ClInclude Include="..\GShr\GdiTools.h" />
<ClInclude Include="Gm.h" />
<ClInclude Include="GmDoc.h" />
Expand Down
12 changes: 0 additions & 12 deletions GM/CBDsgn32.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,12 @@
<ClCompile Include="FrmBited.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FrmBxdoc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FrmDockTile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FrmMain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FrmView.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\GShr\GdiTools.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -361,18 +355,12 @@
<ClInclude Include="FrmBited.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FrmBxdoc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FrmDockTile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FrmMain.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FrmView.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\GShr\GdiTools.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
4 changes: 1 addition & 3 deletions GM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ set(SRCS
DlgTilsz.cpp
DlgTsetp.cpp
FrmBited.cpp
FrmBxdoc.cpp
FrmDockTile.cpp
FrmMain.cpp
FrmView.cpp
Gm.cpp
GmDoc.cpp
LBoxTile.cpp
Expand Down Expand Up @@ -108,7 +106,7 @@ endif()

target_include_directories(CBDesign PRIVATE . ../GShr)
target_precompile_headers(CBDesign PRIVATE StdAfx.h)
target_link_libraries(CBDesign wx::core wx::xrc)
target_link_libraries(CBDesign wx::aui wx::core wx::xrc)

add_custom_command(
OUTPUT "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CBDesign.xrc"
Expand Down
Loading