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

Fix harmless signed/unsigned comparison warning in widgets sample

Browse Source 
Cast WXSIZEOF to int before comparing it with int variables.
This commit is contained in:
Artur Wieczorek
2019-01-19 22:51:44 +01:00
parent 7a6200631a
commit 4fabf5238f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/widgets/headerctrl.cpp
View File

@@ -134,7 +134,7 @@ void HeaderCtrlWidgetsPage::CreateContent()
sizerLeft->Add(sizerHeader, wxSizerFlags().Expand()); sizerLeft->Add(sizerHeader, wxSizerFlags().Expand());
// column flags // column flags
for ( int i = 0; i < WXSIZEOF(m_colSettings); i++ ) for ( int i = 0; i < (int)WXSIZEOF(m_colSettings); i++ )
{ {
wxSizer* sizerCol = new wxStaticBoxSizer(wxVERTICAL, this, wxString::Format("Column %i style", i+1)); wxSizer* sizerCol = new wxStaticBoxSizer(wxVERTICAL, this, wxString::Format("Column %i style", i+1));
m_colSettings[i].chkAllowResize = CreateCheckBoxAndAddToSizer(sizerCol, "Allow resize"); m_colSettings[i].chkAllowResize = CreateCheckBoxAndAddToSizer(sizerCol, "Allow resize");
@@ -169,7 +169,7 @@ void HeaderCtrlWidgetsPage::CreateContent()
m_chkAllowReorder->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this); m_chkAllowReorder->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this);
m_chkAllowHide->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this); m_chkAllowHide->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this);
m_chkBitmapOnRight->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this); m_chkBitmapOnRight->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this);
for ( int i = 0; i < WXSIZEOF(m_colSettings); i++ ) for ( int i = 0; i < (int)WXSIZEOF(m_colSettings); i++ )
{ {
m_colSettings[i].chkAllowResize->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this); m_colSettings[i].chkAllowResize->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this);
m_colSettings[i].chkAllowReorder->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this); m_colSettings[i].chkAllowReorder->Bind(wxEVT_CHECKBOX, &HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox, this);
@@ -234,7 +234,7 @@ long HeaderCtrlWidgetsPage::GetHeaderStyleFlags() const
void HeaderCtrlWidgetsPage::ResetColumnStyle(int col) void HeaderCtrlWidgetsPage::ResetColumnStyle(int col)
{ {
wxASSERT(col < WXSIZEOF(m_colSettings)); wxASSERT(col < (int)WXSIZEOF(m_colSettings));
m_colSettings[col].chkAllowResize->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_RESIZABLE) != 0); m_colSettings[col].chkAllowResize->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_RESIZABLE) != 0);
m_colSettings[col].chkAllowReorder->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_REORDERABLE) != 0); m_colSettings[col].chkAllowReorder->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_REORDERABLE) != 0);
m_colSettings[col].chkAllowSort->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_SORTABLE) != 0); m_colSettings[col].chkAllowSort->SetValue((wxCOL_DEFAULT_FLAGS & wxCOL_SORTABLE) != 0);
@@ -245,7 +245,7 @@ void HeaderCtrlWidgetsPage::ResetColumnStyle(int col)
int HeaderCtrlWidgetsPage::GetColumnStyleFlags(int col) const int HeaderCtrlWidgetsPage::GetColumnStyleFlags(int col) const
{ {
wxASSERT(col < WXSIZEOF(m_colSettings)); wxASSERT(col < (int)WXSIZEOF(m_colSettings));
int flags = 0; int flags = 0;
if ( m_colSettings[col].chkAllowResize->IsChecked() ) if ( m_colSettings[col].chkAllowResize->IsChecked() )
@@ -262,7 +262,7 @@ int HeaderCtrlWidgetsPage::GetColumnStyleFlags(int col) const
wxAlignment HeaderCtrlWidgetsPage::GetColumnAlignmentFlag(int col) const wxAlignment HeaderCtrlWidgetsPage::GetColumnAlignmentFlag(int col) const
{ {
wxASSERT(col < WXSIZEOF(m_colSettings)); wxASSERT(col < (int)WXSIZEOF(m_colSettings));
wxASSERT(WXSIZEOF(gs_colAlignments) == WXSIZEOF(gs_colAlignFlags)); wxASSERT(WXSIZEOF(gs_colAlignments) == WXSIZEOF(gs_colAlignFlags));
int sel = m_colSettings[col].rbAlignments->GetSelection(); int sel = m_colSettings[col].rbAlignments->GetSelection();
return sel == wxNOT_FOUND ? COL_ALIGNMENT_FLAG_DEFAULT : gs_colAlignFlags[sel]; return sel == wxNOT_FOUND ? COL_ALIGNMENT_FLAG_DEFAULT : gs_colAlignFlags[sel];
@@ -280,7 +280,7 @@ void HeaderCtrlWidgetsPage::OnStyleCheckOrRadioBox(wxCommandEvent& WXUNUSED(evt)
void HeaderCtrlWidgetsPage::OnResetButton(wxCommandEvent& WXUNUSED(evt)) void HeaderCtrlWidgetsPage::OnResetButton(wxCommandEvent& WXUNUSED(evt))
{ {
ResetHeaderStyle(); ResetHeaderStyle();
for ( int i = 0; i < WXSIZEOF(m_colSettings); i++ ) for ( int i = 0; i < (int)WXSIZEOF(m_colSettings); i++ )
{ {
ResetColumnStyle(i); ResetColumnStyle(i);
} }
@@ -290,7 +290,7 @@ void HeaderCtrlWidgetsPage::OnResetButton(wxCommandEvent& WXUNUSED(evt))
void HeaderCtrlWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& evt) void HeaderCtrlWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& evt)
{ {
bool enable = GetHeaderStyleFlags() != wxHD_DEFAULT_STYLE; bool enable = GetHeaderStyleFlags() != wxHD_DEFAULT_STYLE;
for ( int i = 0; !enable && i < WXSIZEOF(m_colSettings); i++ ) for ( int i = 0; !enable && i < (int)WXSIZEOF(m_colSettings); i++ )
{ {
enable = enable || GetColumnStyleFlags(i) != wxCOL_DEFAULT_FLAGS enable = enable || GetColumnStyleFlags(i) != wxCOL_DEFAULT_FLAGS
|| m_colSettings[i].chkWithBitmap->IsChecked() != COL_WITH_BITMAP_DEFAULT || m_colSettings[i].chkWithBitmap->IsChecked() != COL_WITH_BITMAP_DEFAULT