Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup in the "artprov" sample after the previous commit

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

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-11-18 20:55:09 +01:00
parent cb8b6009d5
commit 303fa4b3ef
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/artprov/artbrows.cpp
View File

@@ -128,7 +128,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
const int SIZE_CHOICE_ID = ::wxNewId(); 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) wxBEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog)
EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem) EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem)
@@ -141,7 +142,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
{ {
m_current_artid = wxART_ERROR; m_currentArtId = wxART_ERROR;
wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
wxSizer *subsizer; wxSizer *subsizer;
@@ -164,15 +165,12 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
wxSizer *subsub = new wxBoxSizer(wxVERTICAL); wxSizer *subsub = new wxBoxSizer(wxVERTICAL);
m_sizes = new wxChoice( this, SIZE_CHOICE_ID ); m_sizes = new wxChoice( this, SIZE_CHOICE_ID );
int size_index = 0; for ( const int* p = bitmapSizes; *p; ++p )
while( m_bitmap_sizes[size_index] != 0 )
{ {
if( m_bitmap_sizes[size_index] == -1 ) if ( *p == -1 )
m_sizes->Append( "Default" ); m_sizes->Append( "Default" );
else else
m_sizes->Append( wxString::Format("%d x %d", m_bitmap_sizes[size_index], m_bitmap_sizes[size_index] ) ); m_sizes->Append( wxString::Format("%d x %d", *p, *p ) );
size_index++;
} }
m_sizes->SetSelection(0); m_sizes->SetSelection(0);
subsub->Add(m_sizes, 0, wxALL, 4); subsub->Add(m_sizes, 0, wxALL, 4);
@@ -200,7 +198,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
{ {
int size = m_bitmap_sizes[ m_sizes->GetSelection() ]; const int size = bitmapSizes[m_sizes->GetSelection()];
return wxSize(size, size); return wxSize(size, size);
} }
@@ -230,13 +228,13 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
void wxArtBrowserDialog::OnSelectItem(wxListEvent &event) void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
{ {
const char *data = (const char*)event.GetData(); const char *data = (const char*)event.GetData();
m_current_artid = wxString( data ); m_currentArtId = wxString( data );
SetArtBitmap(data, m_client, GetSelectedBitmapSize()); 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) void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)

4
samples/artprov/artbrows.h
View File

@@ -38,9 +38,7 @@ private:
wxStaticText *m_text; wxStaticText *m_text;
wxString m_client; wxString m_client;
wxChoice *m_sizes; wxChoice *m_sizes;
wxString m_current_artid; wxString m_currentArtId;
static int m_bitmap_sizes[7];
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };