From 57c1aa8a759d7dfc408837d6c64f23d8772fc81a Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 2 Jul 2025 21:23:28 -0600 Subject: [PATCH] Don't use wxFRAME_FLOAT_ON_PARENT if there's no parent (KICAD-GJS). (cherry picked from commit 60869cc9500b347aec460ed105832bd5105a716e) --- eeschema/symbol_chooser_frame.cpp | 9 ++++++--- pcbnew/footprint_chooser_frame.cpp | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/eeschema/symbol_chooser_frame.cpp b/eeschema/symbol_chooser_frame.cpp index 4c8f382e15..868902a6ed 100644 --- a/eeschema/symbol_chooser_frame.cpp +++ b/eeschema/symbol_chooser_frame.cpp @@ -62,12 +62,15 @@ BEGIN_EVENT_TABLE( SYMBOL_CHOOSER_FRAME, SCH_BASE_FRAME ) END_EVENT_TABLE() -#define MODAL_FRAME ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ - | wxWANTS_CHARS | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP ) +#define PARENT_STYLE ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ + | wxWANTS_CHARS | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT ) +#define MODAL_STYLE ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ + | wxWANTS_CHARS | wxFRAME_NO_TASKBAR ) SYMBOL_CHOOSER_FRAME::SYMBOL_CHOOSER_FRAME( KIWAY* aKiway, wxWindow* aParent, bool& aCancelled ) : SCH_BASE_FRAME( aKiway, aParent, FRAME_SYMBOL_CHOOSER, _( "Symbol Chooser" ), - wxDefaultPosition, wxDefaultSize, MODAL_FRAME, SYMBOL_CHOOSER_FRAME_NAME ) + wxDefaultPosition, wxDefaultSize, aParent ? PARENT_STYLE : MODAL_STYLE, + SYMBOL_CHOOSER_FRAME_NAME ) { SetModal( true ); diff --git a/pcbnew/footprint_chooser_frame.cpp b/pcbnew/footprint_chooser_frame.cpp index 99b7b248ac..383ba00184 100644 --- a/pcbnew/footprint_chooser_frame.cpp +++ b/pcbnew/footprint_chooser_frame.cpp @@ -81,13 +81,15 @@ BEGIN_EVENT_TABLE( FOOTPRINT_CHOOSER_FRAME, PCB_BASE_FRAME ) END_EVENT_TABLE() -#define MODAL_FRAME ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ - | wxWANTS_CHARS | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT ) +#define PARENT_STYLE ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ + | wxWANTS_CHARS | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT ) +#define MODAL_STYLE ( wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN \ + | wxWANTS_CHARS | wxFRAME_NO_TASKBAR ) FOOTPRINT_CHOOSER_FRAME::FOOTPRINT_CHOOSER_FRAME( KIWAY* aKiway, wxWindow* aParent ) : PCB_BASE_FRAME( aKiway, aParent, FRAME_FOOTPRINT_CHOOSER, _( "Footprint Chooser" ), - wxDefaultPosition, wxDefaultSize, MODAL_FRAME, + wxDefaultPosition, wxDefaultSize, aParent ? PARENT_STYLE : MODAL_STYLE, FOOTPRINT_CHOOSER_FRAME_NAME ), m_filterByPinCount( nullptr ), m_filterByFPFilters( nullptr ),