From cb8b6009d590ae9c72d97fc6fb1abb538638dc34 Mon Sep 17 00:00:00 2001
From: Markus Juergens <markusj@trac.wxwidgets.org>
Date: Sun, 18 Nov 2018 20:49:34 +0100
Subject: [PATCH] Add a size selection choice to the "artprov" sample

This will allow to test support for larger icons when it is added in the
upcoming commits.
---
 samples/artprov/artbrows.cpp | 45 ++++++++++++++++++++++++++++++++----
 samples/artprov/artbrows.h   |  7 ++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index 93e0f9f638..8cefcd5e19 100644
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -126,8 +126,13 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
 
 #include "null.xpm"
 
+const int SIZE_CHOICE_ID = ::wxNewId();
+
+int wxArtBrowserDialog::m_bitmap_sizes[] = { -1, 16, 32, 64, 128, 256, 0 };
+
 wxBEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)
     EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem)
+    EVT_CHOICE(SIZE_CHOICE_ID, wxArtBrowserDialog::OnChangeSize)
     EVT_CHOICE(wxID_ANY, wxArtBrowserDialog::OnChooseClient)
 wxEND_EVENT_TABLE()
 
@@ -136,6 +141,8 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
                wxDefaultPosition, wxDefaultSize,
                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
+    m_current_artid = wxART_ERROR;
+
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     wxSizer *subsizer;
 
@@ -152,16 +159,31 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
     m_list = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(250, 300),
                             wxLC_REPORT | wxSUNKEN_BORDER);
     m_list->AppendColumn("wxArtID");
-    subsizer->Add(m_list, 1, wxEXPAND | wxRIGHT, 10);
+    subsizer->Add(m_list, 0, wxEXPAND | wxRIGHT, 10);
 
     wxSizer *subsub = new wxBoxSizer(wxVERTICAL);
+
+    m_sizes = new wxChoice( this, SIZE_CHOICE_ID );
+    int size_index = 0;
+    while( m_bitmap_sizes[size_index] != 0 )
+    {
+      if( m_bitmap_sizes[size_index] == -1 )
+        m_sizes->Append( "Default" );
+      else
+        m_sizes->Append( wxString::Format("%d x %d", m_bitmap_sizes[size_index], m_bitmap_sizes[size_index] ) );
+
+      size_index++;
+    }
+    m_sizes->SetSelection(0);
+    subsub->Add(m_sizes, 0, wxALL, 4);
+
     m_text = new wxStaticText(this, wxID_ANY, "Size: 333x333");
-    subsub->Add(m_text);
+    subsub->Add(m_text, 0, wxALL, 4);
 
     m_canvas = new wxStaticBitmap(this, wxID_ANY, wxBitmap(null_xpm));
     subsub->Add(m_canvas);
-    subsub->Add(100, 100);
-    subsizer->Add(subsub);
+    subsub->Add(256, 256);
+    subsizer->Add(subsub, 1, wxLEFT, 4 );
 
     sizer->Add(subsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 10);
 
@@ -176,6 +198,13 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 }
 
 
+wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
+{
+  int size = m_bitmap_sizes[ m_sizes->GetSelection() ];
+  return wxSize( size, size );
+}
+
+
 void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 {
     wxBusyCursor bcur;
@@ -201,7 +230,13 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
 {
     const char *data = (const char*)event.GetData();
-    SetArtBitmap(data, m_client, wxDefaultSize);
+    m_current_artid = wxString( data );
+    SetArtBitmap(data, m_client, GetSelectedBitmapSize());
+}
+
+void wxArtBrowserDialog::OnChangeSize(wxCommandEvent &event)
+{
+    SetArtBitmap(m_current_artid, m_client, GetSelectedBitmapSize() );
 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
diff --git a/samples/artprov/artbrows.h b/samples/artprov/artbrows.h
index 977dce30f3..4c794834b1 100644
--- a/samples/artprov/artbrows.h
+++ b/samples/artprov/artbrows.h
@@ -28,12 +28,19 @@ public:
 
 private:
     void OnSelectItem(wxListEvent &event);
+    void OnChangeSize(wxCommandEvent &event);
     void OnChooseClient(wxCommandEvent &event);
 
+    wxSize GetSelectedBitmapSize() const;
+
     wxListCtrl *m_list;
     wxStaticBitmap *m_canvas;
     wxStaticText *m_text;
     wxString m_client;
+    wxChoice *m_sizes;
+    wxString m_current_artid;
+
+    static int m_bitmap_sizes[7];
 
     wxDECLARE_EVENT_TABLE();
 };