Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
86e1f42
wxWidgets: update
wsu-cb Jan 17, 2026
117e954
CB::ToolTip: match wxTipWindow updates
wsu-cb Jan 18, 2026
dd88943
FrmBited: work around wxWidgets 56bd4a
wsu-cb Dec 11, 2025
3c3e915
update to match wxWidgets 30de8f wxDC::GetClippingBox changes
wsu-cb Dec 8, 2025
9516560
fixup! Improve support for parallel file format changes (#115)
wsu-cb Mar 21, 2026
fd2cab7
fixup! Frm*: add wxNativeContainerWindow to all frames to support do…
wsu-cb Feb 19, 2026
2477ed4
CB::ToolTip: fix default width
wsu-cb Feb 8, 2026
6fa75dd
VwBitedt: fix no-select check
wsu-cb Jan 31, 2026
cb75723
VwEdtbrd: enable tile tool
wsu-cb Sep 15, 2025
e41ee3b
CBDesign: fix Delete command ID to wxID_CLEAR
wsu-cb Dec 7, 2025
b0083a7
GamDoc: re-order cleanup
wsu-cb Jan 25, 2026
1a960d9
support 3-state checkbox in updateUI adapter
wsu-cb Dec 13, 2025
5a172d9
CyberBoard.h: CB::ToolTip enhancements
wsu-cb Sep 5, 2025
2bc27ac
CyberBoard.h: wxDC::SetLogicalOrigin helper
wsu-cb Oct 11, 2025
0544023
WinState: provide wx version of WM_WINSTATE
wsu-cb Aug 16, 2025
ae7f48f
VwTbrd: const-, NULL-, and override-correctness
wsu-cb Aug 19, 2025
3850a06
VwTbrd: create an extra window to simplify wx conversion
wsu-cb Aug 18, 2025
b3f70ba
PBoard: implement some wx drawing support
wsu-cb Aug 22, 2025
f111310
VwTbrd: replace MFC with wx
wsu-cb Aug 20, 2025
d58930a
WinPoptb: const-, null-, and override-correctness improvements
wsu-cb Aug 23, 2025
e778075
WinPoptb: replace MFC with wx
wsu-cb Aug 26, 2025
364fddc
VwSelpce: improve const-, null-, override-correctness
wsu-cb Aug 27, 2025
5c77f4e
VwSelpce: create an extra window to simplify wx conversion
wsu-cb Aug 27, 2025
3d74642
LBoxGfx2: improve const-correctness
wsu-cb Sep 9, 2025
3dc22aa
LBoxGfx2: remove messages with no handlers
wsu-cb Aug 28, 2025
0e845ea
LBoxGfx2: mark unreachable code
wsu-cb Aug 30, 2025
9116852
LBoxGfx2: prefer function return value to out-param
wsu-cb Sep 1, 2025
e9c844f
LBoxSlct: improve const-correctness
wsu-cb Aug 31, 2025
7186779
LBoxGfx2/LBoxTileBase2/LBoxSlct: prepare to convert LBoxGfx2 to wx
wsu-cb Aug 31, 2025
83729e6
CBPlay: disable MFC commands that aren't explicitly enabled
wsu-cb Sep 5, 2025
78147b1
LBoxGfx2: provide wx version
wsu-cb Sep 5, 2025
2276c2c
LBoxTileBase2: provide wx version
wsu-cb Sep 5, 2025
0838fe9
LBoxSlct: provide wx version
wsu-cb Sep 5, 2025
a152c7a
VwSelpce: replace MFC with wx
wsu-cb Sep 22, 2025
456a476
LBoxGfx2/LBoxTileBase2/LBoxSlct/LBoxTile: remove obsolete MFC version
wsu-cb Sep 22, 2025
581b53a
VwPbrd: code cleanup
wsu-cb Sep 27, 2025
72551f2
VwPbrd: create an extra window to simplify wx conversion
wsu-cb Sep 24, 2025
3e9054d
Gp: provide wx version of some WM messages
wsu-cb Oct 3, 2025
325b046
LBoxGrfx: provide wx version of some WM messages
wsu-cb Feb 1, 2026
5ee3cb3
GamDoc: remove dead code
wsu-cb Oct 4, 2025
a9156cd
ToolPlay: improve const/null/override/ownership correctness
wsu-cb Oct 23, 2025
943647a
VwPbrd: start converting from MFC to wx
wsu-cb Oct 7, 2025
967b66b
VwPbrd: wxOverlay demo
wsu-cb Oct 20, 2025
5721c7c
VwPbrd: basic mouse handling
wsu-cb Oct 18, 2025
857aa8c
VwPbrd: use wxScrolledCanvas
wsu-cb Dec 2, 2025
9793cb4
VwPbrd: implement drag-move
wsu-cb Dec 9, 2025
f3e007e
VwPbrd: implement some event handlers
wsu-cb Dec 9, 2025
4f1a97a
VwPbrd: implement some more event handlers
wsu-cb Dec 10, 2025
140933b
VwPbrd: implement event handlers, part 3
wsu-cb Dec 12, 2025
6641386
VwPbrd: implement context menu
wsu-cb Feb 22, 2026
2ee007b
VwPbrd: handle object rotation menu options
wsu-cb Dec 13, 2025
307b70b
VwPbrd: convert MFC ID_MRKGROUP_FIRST to wx
wsu-cb Feb 25, 2026
14ae10b
VwPbrd: implement tooltips
wsu-cb Jan 17, 2026
cb320c0
PalMark: const/NULL/override/deadcode cleanup
wsu-cb Jan 27, 2026
f04f679
FrmDockMark: const/null/override/access correctness
wsu-cb Jan 28, 2026
a24fdd8
PalMark/PalTray: tie palette lifetime to HWND lifetime
wsu-cb Jan 29, 2026
d65731f
provide wx variant of WM_PALETTE_HIDE message
wsu-cb Jan 30, 2026
2b544d2
LibMfc: avoid an ASSERT from inside MFC
wsu-cb Feb 1, 2026
6582d1e
PalMark: create an extra window to simplify wx conversion
wsu-cb Feb 15, 2026
17e0cf5
PalMark: convert to wx
wsu-cb Feb 2, 2026
9ca45bb
Versions: templatize CArchive& << and CArchive& >>
wsu-cb Feb 6, 2026
bb27407
PalTray: code cleanup
wsu-cb Feb 5, 2026
9f60409
PalTray: create an extra window to simplify wx conversion
wsu-cb Feb 16, 2026
42b6506
LBoxGrfx: implement support for PalTray
wsu-cb Feb 8, 2026
1f56897
LBoxTray: implement support for PalTray
wsu-cb Feb 8, 2026
a7f5fbb
PalTray: start converting from MFC to wx
wsu-cb Feb 8, 2026
4058496
Gp.h: #include guard
wsu-cb Feb 9, 2026
192ee3e
GamDoc: DoEditPieceText() default all-sides off when no text
wsu-cb Feb 18, 2026
7a9c44a
LBoxVHScrl: fix GetSelections() to handle single selection
wsu-cb Feb 18, 2026
18c2585
LBoxGrfx: fix UpdateList() to handle change from non-empty ...
wsu-cb Feb 18, 2026
cbcbdf4
PalTray: convert some event handlers from MFC to wx
wsu-cb Feb 19, 2026
fddc443
PalTray: convert MFC drag-from to wx
wsu-cb Feb 20, 2026
b3b5313
PalTray: convert context menu from MFC to wx
wsu-cb Feb 22, 2026
6296b07
PalTray: convert MFC message handlers to wx
wsu-cb Feb 27, 2026
8dd2509
VwPbrd: remove old code whose replacement code has been validated
wsu-cb Mar 20, 2026
fbf1fde
update cmake for MSVS 2026
wsu-cb Mar 23, 2026
1ccab74
more MS VS 2026 support
wsu-cb Mar 24, 2026
ba64557
try to fix missing GHelp/CBoard.chm error
wsu-cb Mar 24, 2026
11f6fc3
VwPrjgsn: fix signed/unsigned warning
wsu-cb Mar 24, 2026
000662f
update some copyright strings
wsu-cb Mar 26, 2026
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 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2023 By William Su, All Rights Reserved.

cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.10...4.1)
# set VERSION variables
cmake_policy(SET CMP0048 NEW)
# provide CMAKE_MSVC_RUNTIME_LIBRARY
Expand Down
4 changes: 2 additions & 2 deletions GHelp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/fixhhc.bat "if errorlevel 1 exit /b 0\n"
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/fixhhc.bat "exit /b 1\n")

add_custom_command(
OUTPUT CBoard.chm
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/CBoard.chm
COMMENT "Make CBoard.chm"
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/gmhelp.h ${CMAKE_CURRENT_SOURCE_DIR}/gmhelpidmap.h
Expand All @@ -57,4 +57,4 @@ add_custom_command(
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

add_custom_target(CBHelp ALL DEPENDS cboard.chm)
add_custom_target(CBHelp ALL DEPENDS CBoard.chm)
2 changes: 1 addition & 1 deletion GM/CBDesign.fbp
Original file line number Diff line number Diff line change
Expand Up @@ -20509,7 +20509,7 @@
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">&amp;Delete</property>
<property name="name">wxID_DELETE</property>
<property name="name">wxID_CLEAR</property>
<property name="permission">none</property>
<property name="shortcut">Del</property>
<property name="unchecked_bitmap"></property>
Expand Down
2 changes: 1 addition & 1 deletion GM/CBDesign.xrc
Original file line number Diff line number Diff line change
Expand Up @@ -3894,7 +3894,7 @@
<accel>Ctrl+M</accel>
<help>Move clipboard objects to new locations\nMove</help>
</object>
<object class="wxMenuItem" name="wxID_DELETE">
<object class="wxMenuItem" name="wxID_CLEAR">
<label>_Delete</label>
<accel>Del</accel>
<help>Erase the current selection\nDelete (Del)</help>
Expand Down
6 changes: 5 additions & 1 deletion GM/FrmBited.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ CBitEditFrame::CBitEditFrame(wxDocument& doc,
BASE(&doc, &view, &parent, wxID_ANY,
doc.GetUserReadableName() + " - Tile Editor"),
m_wndSplitter([this, &view]{
wxSplitterWindow* retval = new wxSplitterWindow(this,
wxSplitterWindow* retval = new wxSplitterWindow;
// KLUDGE: prevent events until m_wndSplitter set
retval->Hide();
retval->Create(this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize,
Expand All @@ -76,6 +79,7 @@ CBitEditFrame::CBitEditFrame(wxDocument& doc,
return retval;
}())
{
m_wndSplitter->Show();
SetIcon(wxIcon(std::format("#{}", IDR_BITEDITOR),
wxBITMAP_TYPE_ICO_RESOURCE,
16, 16));
Expand Down
2 changes: 2 additions & 0 deletions GM/LBoxTile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const int tileBorder = 3;

/////////////////////////////////////////////////////////////////////////////

#if 0
BEGIN_MESSAGE_MAP(CTileListBox, CGrafixListBox)
//{{AFX_MSG_MAP(CTileListBox)
//}}AFX_MSG_MAP
Expand Down Expand Up @@ -171,6 +172,7 @@ BOOL CTileListBox::OnDragSetup(DragInfo& pDI) const
}
return TRUE;
}
#endif

/////////////////////////////////////////////////////////////////////////////

Expand Down
2 changes: 1 addition & 1 deletion GM/VwBitedt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ void CBitEditView::OnImageBoardMask(wxCommandEvent& /*event*/)
CBoardManager& pBMgr = GetDocument().GetBoardManager();

CBoardMaskDialog dlg(pBMgr);
if (dlg.ShowModal() != wxID_OK || dlg.m_nBrdNum == Invalid_v<size_t>)
if (dlg.ShowModal() != wxID_OK || dlg.m_nBrdNum == wxNOT_FOUND)
return;

CBoard& pBoard = pBMgr.GetBoard(value_preserving_cast<size_t>(dlg.m_nBrdNum));
Expand Down
6 changes: 1 addition & 5 deletions GM/VwEdtbrd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void CBrdEditView::OnDraw(wxDC& pDC)
wxRect oRct;
wxDC* pDrawDC = &pDC;

CB_VERIFY(pDC.GetClippingBox(oRct));
pDC.GetClippingBox(oRct);
if (oRct.IsEmpty())
{
return; // Nothing to do
Expand Down Expand Up @@ -1389,11 +1389,7 @@ void CBrdEditView::OnUpdateToolPalette(wxUpdateUIEvent& pCmdUI)

if (pCmdUI.GetId() == XRCID("ID_TOOL_TILE"))
{
#if 0
tid = GetDocument().GetTilePalWnd().GetCurrentTileID();
#else
tid = nullTid;
#endif
bEnable = tid != nullTid;
if (tid == nullTid && m_nCurToolID == XRCID("ID_TOOL_TILE"))
{
Expand Down
Loading
Loading