From 303fa4b3ef632a5a9e887c416d56028a90b2c643 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Nov 2018 20:55:09 +0100
Subject: [PATCH] Minor cleanup in the "artprov" sample after the previous
 commit

Use the standard wxWidgets camelCase naming convention instead of
snake_case and fix some style inconsistencies.

No real changes.
---
 samples/artprov/artbrows.cpp | 24 +++++++++++-------------
 samples/artprov/artbrows.h   |  4 +---
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index 8cefcd5e19..ea0b9944da 100644
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -128,7 +128,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
 
 const int SIZE_CHOICE_ID = ::wxNewId();
 
-int wxArtBrowserDialog::m_bitmap_sizes[] = { -1, 16, 32, 64, 128, 256, 0 };
+// Bitmap sizes that can be chosen in the size selection wxChoice.
+static const int bitmapSizes[] = { -1, 16, 32, 64, 128, 256, 0 };
 
 wxBEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)
     EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem)
@@ -141,7 +142,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
                wxDefaultPosition, wxDefaultSize,
                wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
-    m_current_artid = wxART_ERROR;
+    m_currentArtId = wxART_ERROR;
 
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     wxSizer *subsizer;
@@ -164,15 +165,12 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
     wxSizer *subsub = new wxBoxSizer(wxVERTICAL);
 
     m_sizes = new wxChoice( this, SIZE_CHOICE_ID );
-    int size_index = 0;
-    while( m_bitmap_sizes[size_index] != 0 )
+    for ( const int* p = bitmapSizes; *p; ++p )
     {
-      if( m_bitmap_sizes[size_index] == -1 )
+      if ( *p == -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->Append( wxString::Format("%d x %d", *p, *p ) );
     }
     m_sizes->SetSelection(0);
     subsub->Add(m_sizes, 0, wxALL, 4);
@@ -200,8 +198,8 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
 
 wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
 {
-  int size = m_bitmap_sizes[ m_sizes->GetSelection() ];
-  return wxSize( size, size );
+  const int size = bitmapSizes[m_sizes->GetSelection()];
+  return wxSize(size, size);
 }
 
 
@@ -230,13 +228,13 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
 void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
 {
     const char *data = (const char*)event.GetData();
-    m_current_artid = wxString( data );
+    m_currentArtId = wxString( data );
     SetArtBitmap(data, m_client, GetSelectedBitmapSize());
 }
 
-void wxArtBrowserDialog::OnChangeSize(wxCommandEvent &event)
+void wxArtBrowserDialog::OnChangeSize(wxCommandEvent& WXUNUSED(event))
 {
-    SetArtBitmap(m_current_artid, m_client, GetSelectedBitmapSize() );
+    SetArtBitmap(m_currentArtId, m_client, GetSelectedBitmapSize() );
 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
diff --git a/samples/artprov/artbrows.h b/samples/artprov/artbrows.h
index 4c794834b1..e1dbb093b5 100644
--- a/samples/artprov/artbrows.h
+++ b/samples/artprov/artbrows.h
@@ -38,9 +38,7 @@ private:
     wxStaticText *m_text;
     wxString m_client;
     wxChoice *m_sizes;
-    wxString m_current_artid;
-
-    static int m_bitmap_sizes[7];
+    wxString m_currentArtId;
 
     wxDECLARE_EVENT_TABLE();
 };