From fb059b99b6b3e970d39bd2c8a2c36a5bad0d2ac4 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 5 Jun 2015 15:46:05 +0200 Subject: [PATCH] Cvpcb: fix a regression: in the stable version one could select many components and assign a footprint to the whole selection. Select more than on component is now re-enabled --- cvpcb/class_components_listbox.cpp | 2 +- cvpcb/class_footprints_listbox.cpp | 2 +- cvpcb/class_library_listbox.cpp | 2 +- cvpcb/cvpcb.h | 2 -- cvpcb/cvstruct.h | 4 +++- cvpcb/listboxes.cpp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cvpcb/class_components_listbox.cpp b/cvpcb/class_components_listbox.cpp index 3a46ebab37..c4188f3584 100644 --- a/cvpcb/class_components_listbox.cpp +++ b/cvpcb/class_components_listbox.cpp @@ -36,7 +36,7 @@ COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id, const wxPoint& loc, const wxSize& size ) : - ITEMS_LISTBOX_BASE( parent, id, loc, size, LISTB_STYLE & ~wxLC_SINGLE_SEL ) + ITEMS_LISTBOX_BASE( parent, id, loc, size, 0 ) { } diff --git a/cvpcb/class_footprints_listbox.cpp b/cvpcb/class_footprints_listbox.cpp index f2ef7b1008..553a950afa 100644 --- a/cvpcb/class_footprints_listbox.cpp +++ b/cvpcb/class_footprints_listbox.cpp @@ -42,7 +42,7 @@ FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id, const wxPoint& loc, const wxSize& size ) : - ITEMS_LISTBOX_BASE( parent, id, loc, size ) + ITEMS_LISTBOX_BASE( parent, id, loc, size, wxLC_SINGLE_SEL ) { } diff --git a/cvpcb/class_library_listbox.cpp b/cvpcb/class_library_listbox.cpp index 259c2b15b1..53fe40dd60 100644 --- a/cvpcb/class_library_listbox.cpp +++ b/cvpcb/class_library_listbox.cpp @@ -42,7 +42,7 @@ LIBRARY_LISTBOX::LIBRARY_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id, const wxPoint& loc, const wxSize& size ) : - ITEMS_LISTBOX_BASE( parent, id, loc, size ) + ITEMS_LISTBOX_BASE( parent, id, loc, size, wxLC_SINGLE_SEL ) { } diff --git a/cvpcb/cvpcb.h b/cvpcb/cvpcb.h index 50b7afe2f5..eec99eafd4 100644 --- a/cvpcb/cvpcb.h +++ b/cvpcb/cvpcb.h @@ -33,8 +33,6 @@ #define FILTERFOOTPRINTKEY "FilterFootprint" -#define LISTB_STYLE ( wxSUNKEN_BORDER | wxLC_NO_HEADER | wxLC_REPORT | wxLC_VIRTUAL | \ - wxLC_SINGLE_SEL | wxVSCROLL | wxHSCROLL ) extern const wxString EquFileExtension; extern const wxString EquFilesWildcard; diff --git a/cvpcb/cvstruct.h b/cvpcb/cvstruct.h index d262d0ba19..26be44264f 100644 --- a/cvpcb/cvstruct.h +++ b/cvpcb/cvstruct.h @@ -36,6 +36,8 @@ class CVPCB_MAINFRAME; class COMPONENT; class FOOTPRINT_LIST; +#define LISTBOX_STYLE ( wxSUNKEN_BORDER | wxLC_NO_HEADER | wxLC_REPORT | wxLC_VIRTUAL | \ + wxVSCROLL | wxHSCROLL ) /*********************************************************************/ /* ListBox (base class) to display lists of components or footprints */ @@ -45,7 +47,7 @@ class ITEMS_LISTBOX_BASE : public wxListView public: ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId, const wxPoint& aLocation, const wxSize& aSize, - long aStyle = wxLC_SINGLE_SEL ); + long aStyle = 0 ); ~ITEMS_LISTBOX_BASE(); diff --git a/cvpcb/listboxes.cpp b/cvpcb/listboxes.cpp index da2d6cf938..2ef8b25239 100644 --- a/cvpcb/listboxes.cpp +++ b/cvpcb/listboxes.cpp @@ -44,7 +44,7 @@ ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId, const wxPoint& aLocation, const wxSize& aSize, long aStyle) : - wxListView( aParent, aId, aLocation, aSize, LISTB_STYLE | aStyle ), columnWidth(0) + wxListView( aParent, aId, aLocation, aSize, LISTBOX_STYLE | aStyle ), columnWidth(0) { InsertColumn( 0, wxEmptyString ); } @@ -95,7 +95,7 @@ void ITEMS_LISTBOX_BASE::UpdateLineWidth( unsigned aLine ) { columnWidth = newWidth; SetColumnWidth( 0, columnWidth ); - } + } }