card viewers/editors inherit from wxPanel;

GallertList doesn't call select() from onSize

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1139 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gui/control/card_editor.cpp

@@ -65,7 +65,7 @@ void DataEditor::addAction(Action* action) {
 // ----------------------------------------------------------------------------- : Selection
 
 bool DataEditor::AcceptsFocus() const {
-	return wxControl::AcceptsFocus();
+	return wxWindow::AcceptsFocus();
 }
 
 void DataEditor::select(ValueViewer* v) {

src/gui/control/card_viewer.cpp

@@ -20,7 +20,7 @@ DEFINE_EVENT_TYPE(EVENT_SIZE_CHANGE);
 // ----------------------------------------------------------------------------- : CardViewer
 
 CardViewer::CardViewer(Window* parent, int id, long style)
-	: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, style)
+	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, style & wxNO_BORDER ? style : style | wxSUNKEN_BORDER)
 	, up_to_date(false)
 {}
 

src/gui/control/card_viewer.hpp

@@ -22,7 +22,7 @@ DECLARE_EVENT_TYPE(EVENT_SIZE_CHANGE, <not used>)
 // ----------------------------------------------------------------------------- : CardViewer
 
 /// A control to view a single card
-class CardViewer : public wxControl, public DataViewer {
+class CardViewer : public wxPanel, public DataViewer {
   public:
 	CardViewer(Window* parent, int id, long style = 0);
 	

src/gui/control/gallery_list.cpp

@@ -72,8 +72,17 @@ void GalleryList::select(size_t item, size_t subcolumn, bool event) {
 }
 
 void GalleryList::update() {
-	select(subcolumns[active_subcolumn].selection);
+	// ensure selection is visible
-	updateScrollbar();
+	SubColumn col = subcolumns[active_subcolumn];
+	if (col.selection != NO_SELECTION) {
+		if (itemStart(col.selection) < visible_start) {
+			scrollTo(itemStart(col.selection), false);
+			updateScrollbar();
+		} else if (itemEnd(col.selection) > visibleEnd()) {
+			scrollTo(itemEnd(col.selection) + visible_start - visibleEnd(), false);
+			updateScrollbar();
+		}
+	}
 	Refresh(false);
 }
 

src/gui/control/text_ctrl.cpp

@@ -37,7 +37,7 @@ void TextCtrl::draw(DC& dc) {
 }
 
 bool TextCtrl::AcceptsFocus() const {
-	return wxControl::AcceptsFocus() && 
+	return wxWindow::AcceptsFocus() && 
 	       !viewers.empty() &&
 	       static_cast<FakeTextValue&>(*viewers.front()->getValue()).editable;
 }