Skip to content

Gm aui fixes+start gp dlgs #137

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 44 commits into from
Aug 8, 2025
Merged

Gm aui fixes+start gp dlgs #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9fb2601
wxWidgets: update for new features
wsu-cb Jul 27, 2025
d8b4448
fixup! GamDoc: replace CString/char*/etc with CB::string
wsu-cb Apr 18, 2025
69a4da4
fix COLORREF to wxColour conversions
wsu-cb Jul 4, 2025
a321012
fix order of member construction
wsu-cb Jun 16, 2025
1891148
VwEdtbrd/VwBitedt: fix missing File MRU menu items
wsu-cb May 17, 2025
8694626
FrmDockTile: improve floating palette size handling
wsu-cb Jun 8, 2025
ba646b8
FrmBited/VwPrjgbx: fix Ctrl-Tab handling
wsu-cb Jun 8, 2025
5243bf7
CyberBoard.h: add wx/checklst.h
wsu-cb Jun 15, 2025
2b35cea
CyberBoard.h: support non-default styles for numeric validators
wsu-cb Jul 8, 2025
69449a0
GP: prepare to use wxWidgets xrc system
wsu-cb Apr 19, 2025
d98860a
LibMfc: provide wx version of AppendStringToEditBox()
wsu-cb Jul 13, 2025
0ce8aaf
GP: implement CB::GetAppName()
wsu-cb Jul 7, 2025
faca7d0
DlgChgGameOwner: improve null-correctness
wsu-cb Apr 19, 2025
0d30859
DlgChgGameOwner: replace MFC with wx
wsu-cb Jul 20, 2025
80dead1
LibMfc: untested code now verified
wsu-cb Apr 23, 2025
c6100c1
DlgDice: replace MFC with wx
wsu-cb Apr 23, 2025
224742e
DlgEdtEl: replace MFC with wx
wsu-cb Apr 26, 2025
1be6238
DlgEPly: const- and null-correctness improvements
wsu-cb Jun 11, 2025
fdeb3be
DlgEPly: replace MFC with wx
wsu-cb Jun 11, 2025
929bf51
GamDoc: improve const- and null-correctness
wsu-cb Jun 14, 2025
07edee4
DlgItray: improve null-correctness
wsu-cb Jun 14, 2025
61ad77f
DlgItray: replace MFC with wx
wsu-cb Jun 15, 2025
4ae4924
DlgMarkCount: replace MFC with wx
wsu-cb Jun 15, 2025
388faf9
DlgMdesc: convert MFC to wx
wsu-cb Jun 16, 2025
9c47422
DlgMPly: convert MFC to wx
wsu-cb Jun 19, 2025
4cadadf
DlgNewGeoBoard: convert MFC to wx
wsu-cb Jun 22, 2025
2e866b7
DlgNPly: convert MFC to wx
wsu-cb Jun 22, 2025
354f440
DlgPass: convert MFC to wx
wsu-cb Jun 22, 2025
2f91e86
Player: improve type safety and replace MFC with STL
wsu-cb Jul 1, 2025
2baf928
DlgPbprp: replace MFC with wx
wsu-cb Jul 4, 2025
7f42c6c
DlgRmsg/DlgRot: mark as unused
wsu-cb Jul 4, 2025
0741e8f
DlgRotpc: replace MFC with wx
wsu-cb Jul 6, 2025
466998e
DlgScnp: replace MFC with wx
wsu-cb Jul 6, 2025
5aff6ae
DlgSelOwner: replace MFC with wx
wsu-cb Jul 6, 2025
f34f905
DlgSlbrd: replace MFC with wx
wsu-cb Jul 7, 2025
d4138a8
Editnocv: provide wx version
wsu-cb Jul 12, 2025
2b88833
DlgSmsg: convert MFC to wx
wsu-cb Jul 13, 2025
6b40779
DlgSmsg: remove dead code
wsu-cb Jul 13, 2025
cd085a8
DlgSpece: improve const- and null-correctness
wsu-cb Jul 14, 2025
7568642
LBoxTray: provide wx version
wsu-cb Jul 17, 2025
fee9f65
DlgSpece: convert MFC to wx
wsu-cb Jul 17, 2025
3cc5d5d
GP: make .vcxproj build work
wsu-cb Jul 30, 2025
2786437
GM/FrmMain: save/restore mainframe layout
wsu-cb Aug 8, 2025
05a0725
GM/FrmMain: save/restore wxAuiManager layout
wsu-cb Aug 8, 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ endif()
set(wxBUILD_INSTALL OFF CACHE BOOL "skip")
set(wxBUILD_SHARED OFF CACHE BOOL "skip")
set(wxBUILD_USE_STATIC_RUNTIME ON CACHE BOOL "skip")
set(wxUSE_LIBWEBP OFF CACHE BOOL "skip")
set(wxUSE_MEDIACTRL OFF CACHE BOOL "skip")
set(wxUSE_POSTSCRIPT OFF CACHE BOOL "skip")
set(wxUSE_STC OFF CACHE BOOL "skip")
Expand Down
30 changes: 15 additions & 15 deletions GM/CBDesign.fbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5932,7 +5932,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
<object class="sizeritem" expanded="false">
Expand Down Expand Up @@ -6295,7 +6295,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
<object class="sizeritem" expanded="false">
Expand Down Expand Up @@ -6354,7 +6354,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
<object class="sizeritem" expanded="false">
Expand Down Expand Up @@ -6413,7 +6413,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
<object class="sizeritem" expanded="false">
Expand Down Expand Up @@ -9110,7 +9110,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -9242,7 +9242,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -9836,7 +9836,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -9968,7 +9968,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -13251,7 +13251,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -13451,7 +13451,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -13583,7 +13583,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -15952,7 +15952,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
<object class="sizeritem" expanded="false">
Expand Down Expand Up @@ -16011,7 +16011,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -16923,7 +16923,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down Expand Up @@ -19841,7 +19841,7 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
<property name="window_style">wxBORDER_SIMPLE|wxWANTS_CHARS</property>
</object>
</object>
</object>
Expand Down
30 changes: 15 additions & 15 deletions GM/CBDesign.xrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listProj" subclass="CProjListBoxGm">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
<object class="sizeritem">
Expand Down Expand Up @@ -1146,7 +1146,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listTiles" subclass="CTileListBoxWx">
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxWANTS_CHARS</style>
<hidden>1</hidden>
</object>
</object>
Expand All @@ -1155,7 +1155,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listPieces" subclass="CPieceListBoxWx">
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxWANTS_CHARS</style>
<hidden>1</hidden>
</object>
</object>
Expand All @@ -1164,7 +1164,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listMarks" subclass="CMarkListBoxWx">
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxLB_MULTIPLE|wxBORDER_SIMPLE|wxWANTS_CHARS</style>
<hidden>1</hidden>
</object>
</object>
Expand Down Expand Up @@ -1660,7 +1660,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listTiles" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand All @@ -1685,7 +1685,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listMarks" subclass="CMarkListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -1796,7 +1796,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listTiles" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand All @@ -1821,7 +1821,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listMarks" subclass="CMarkListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -2452,7 +2452,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listFtile" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -2486,7 +2486,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listBtile" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand All @@ -2511,7 +2511,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listPieces" subclass="CPieceListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -2958,15 +2958,15 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listFtile" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
<object class="sizeritem">
<flag>wxEXPAND|wxBOTTOM|wxRIGHT</flag>
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listBtile" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -3137,7 +3137,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listPieces" subclass="CPieceListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down Expand Up @@ -3729,7 +3729,7 @@
<border>5</border>
<option>1</option>
<object class="wxVListBox" name="m_listTile" subclass="CTileListBoxWx">
<style>wxBORDER_SIMPLE|wxTAB_TRAVERSAL|wxWANTS_CHARS</style>
<style>wxBORDER_SIMPLE|wxWANTS_CHARS</style>
</object>
</object>
</object>
Expand Down
60 changes: 30 additions & 30 deletions GM/DlgBrdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,6 @@ class CBoardPropDialog : public wxDialog
CBoardPropDialog(wxWindow* parent = &CB::GetMainWndWx()); // standard constructor

// Dialog Data
private:
CB_XRC_BEGIN_CTRLS_DECL()
RefPtr<wxStaticText> m_staticHalfPixelWidth;
RefPtr<wxStaticText> m_staticSmallPixelWidth;
RefPtr<wxStaticText> m_staticSmallPixelHeight;
RefPtr<wxStaticText> m_staticHalfPixelHeight;
RefPtr<wxStaticText> m_staticPixelWidth;
RefPtr<wxStaticText> m_staticPixelHeight;
RefPtr<wxTextCtrl> m_editBrdName;
RefPtr<wxColourPickerCtrl> m_cpCellFrame;
RefPtr<wxStaticText> m_staticWidth;
RefPtr<wxStaticText> m_staticHeight;
RefPtr<wxStaticText> m_staticRows;
RefPtr<wxStaticText> m_staticCols;
RefPtr<wxChoice> m_comboStyle;
RefPtr<wxCheckBox> m_chkCellLines;
RefPtr<wxCheckBox> m_chkGridSnap;
RefPtr<wxCheckBox> m_chkTrackCellNum;
RefPtr<wxTextCtrl> m_editRowTrkOffset;
RefPtr<wxTextCtrl> m_editColTrkOffset;
RefPtr<wxTextCtrl> m_editXGridSnapOff;
RefPtr<wxTextCtrl> m_editYGridSnapOff;
RefPtr<wxTextCtrl> m_editXGridSnap;
RefPtr<wxTextCtrl> m_editYGridSnap;
RefPtr<wxCheckBox> m_chkColTrkInvert;
RefPtr<wxCheckBox> m_chkRowTrkInvert;
RefPtr<wxCheckBox> m_chkCellBorderOnTop;
RefPtr<wxCheckBox> m_chkEnableXParentCells;
CB_XRC_END_CTRLS_DECL()
public:
bool m_bCellLines;
bool m_bGridSnap;
bool m_bTrackCellNum;
Expand Down Expand Up @@ -97,6 +67,36 @@ class CBoardPropDialog : public wxDialog
uint32_t m_nCellHt;
uint32_t m_nCellWd;
CellStagger m_bStagger;
private:
CB_XRC_BEGIN_CTRLS_DECL()
RefPtr<wxStaticText> m_staticHalfPixelWidth;
RefPtr<wxStaticText> m_staticSmallPixelWidth;
RefPtr<wxStaticText> m_staticSmallPixelHeight;
RefPtr<wxStaticText> m_staticHalfPixelHeight;
RefPtr<wxStaticText> m_staticPixelWidth;
RefPtr<wxStaticText> m_staticPixelHeight;
RefPtr<wxTextCtrl> m_editBrdName;
RefPtr<wxColourPickerCtrl> m_cpCellFrame;
RefPtr<wxStaticText> m_staticWidth;
RefPtr<wxStaticText> m_staticHeight;
RefPtr<wxStaticText> m_staticRows;
RefPtr<wxStaticText> m_staticCols;
RefPtr<wxChoice> m_comboStyle;
RefPtr<wxCheckBox> m_chkCellLines;
RefPtr<wxCheckBox> m_chkGridSnap;
RefPtr<wxCheckBox> m_chkTrackCellNum;
RefPtr<wxTextCtrl> m_editRowTrkOffset;
RefPtr<wxTextCtrl> m_editColTrkOffset;
RefPtr<wxTextCtrl> m_editXGridSnapOff;
RefPtr<wxTextCtrl> m_editYGridSnapOff;
RefPtr<wxTextCtrl> m_editXGridSnap;
RefPtr<wxTextCtrl> m_editYGridSnap;
RefPtr<wxCheckBox> m_chkColTrkInvert;
RefPtr<wxCheckBox> m_chkRowTrkInvert;
RefPtr<wxCheckBox> m_chkCellBorderOnTop;
RefPtr<wxCheckBox> m_chkEnableXParentCells;
CB_XRC_END_CTRLS_DECL()
public:

// Implementation
protected:
Expand Down
16 changes: 8 additions & 8 deletions GM/DlgBrdsz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ class CBoardReshapeDialog : public wxDialog
CBoardReshapeDialog(wxWindow* parent = &CB::GetMainWndWx()); // standard constructor

// Dialog Data
uint32_t m_nCellHt;
uint32_t m_nCellWd;
size_t m_nCols;
size_t m_nRows;
CellStagger m_bStagger;

CellFormType m_eCellStyle; // Used to disable cell a cell dimension
private:
bool m_bStaggerAdapter;
CB_XRC_BEGIN_CTRLS_DECL()
RefPtr<wxCheckBox> m_checkStaggerIn;
RefPtr<wxTextCtrl> m_editCellWd;
RefPtr<wxTextCtrl> m_editCellHt;
RefPtr<wxTextCtrl> m_editCols;
RefPtr<wxTextCtrl> m_editRows;
CB_XRC_END_CTRLS_DECL()
bool m_bStaggerAdapter;
public:
uint32_t m_nCellHt;
uint32_t m_nCellWd;
size_t m_nCols;
size_t m_nRows;
CellStagger m_bStagger;

CellFormType m_eCellStyle; // Used to disable cell a cell dimension

// Implementation
protected:
Expand Down
Loading