From 5c8a8b52722d95501e4f72eae5af14029c0467c3 Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Tue, 24 Jun 2025 21:45:26 -0400 Subject: [PATCH] Expose our define for message dialog to the header for reuse --- common/confirm.cpp | 9 --------- include/confirm.h | 12 +++++++++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/common/confirm.cpp b/common/confirm.cpp index 6fdf383595..7589bb12c1 100644 --- a/common/confirm.cpp +++ b/common/confirm.cpp @@ -31,15 +31,6 @@ #include #include #include - -#if defined( _WIN32 ) && wxCHECK_VERSION( 3, 3, 0 ) -#define KICAD_MESSAGE_DIALOG_BASE wxGenericMessageDialog -#define KICAD_RICH_MESSAGE_DIALOG_BASE wxGenericRichMessageDialog -#else -#define KICAD_MESSAGE_DIALOG_BASE wxMessageDialog -#define KICAD_RICH_MESSAGE_DIALOG_BASE wxRichMessageDialog -#endif - /** * Flag to enable confirmation dialog debugging output. * diff --git a/include/confirm.h b/include/confirm.h index fe99979f9a..2124fa6be2 100644 --- a/include/confirm.h +++ b/include/confirm.h @@ -35,13 +35,19 @@ #include #include #include -//#include -//#include -//#include class wxWindow; +#if defined( _WIN32 ) && wxCHECK_VERSION( 3, 3, 0 ) +#define KICAD_MESSAGE_DIALOG_BASE wxGenericMessageDialog +#define KICAD_RICH_MESSAGE_DIALOG_BASE wxGenericRichMessageDialog +#else +#define KICAD_MESSAGE_DIALOG_BASE wxMessageDialog +#define KICAD_RICH_MESSAGE_DIALOG_BASE wxRichMessageDialog +#endif + + /** * Display a dialog indicating the file is already open, with an option to reset the lock. * @return true if the lock was reset.