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

Fix wxPen and wxBrush style deprecation warnings in utils

Browse Source 
Fix a warning about hidden local variable in the helpview util.
This commit is contained in:
Maarten Bent
2017-11-25 17:32:17 +01:00
parent 2156d29801
commit dc6858d905
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/emulator/src/emulator.cpp
View File

@@ -396,7 +396,7 @@ void wxEmulatorContainer::OnEraseBackground(wxEraseEvent& event)
dc = new wxClientDC(this); dc = new wxClientDC(this);
} }
dc->SetBackground(wxBrush(wxGetApp().m_emulatorInfo.m_emulatorBackgroundColour, wxSOLID)); dc->SetBackground(wxBrush(wxGetApp().m_emulatorInfo.m_emulatorBackgroundColour));
dc->Clear(); dc->Clear();
if (!event.GetDC()) if (!event.GetDC())

6
utils/helpview/src/helpview.cpp
View File

@@ -119,15 +119,15 @@ bool hvApp::OnInit()
} }
else if ( argStr.Find( wxT("--Style") ) >= 0 ) else if ( argStr.Find( wxT("--Style") ) >= 0 )
{ {
long i; long style;
wxString numb = argStr.AfterLast(wxT('e')); wxString numb = argStr.AfterLast(wxT('e'));
if ( !(numb.ToLong(&i) ) ) if ( !(numb.ToLong(&style) ) )
{ {
wxLogError( wxT("Integer conversion failed for --Style") ); wxLogError( wxT("Integer conversion failed for --Style") );
} }
else else
{ {
istyle = i; istyle = style;
} }
} }
else else

24
utils/screenshotgen/src/customcombo.cpp
View File

@@ -58,29 +58,29 @@ void PenStyleComboBox::OnDrawItem( wxDC& dc,
r.Deflate(3); r.Deflate(3);
r.height -= 2; r.height -= 2;
int penStyle = wxSOLID; wxPenStyle penStyle = wxPENSTYLE_SOLID;
// if ( item == 1 ) // if ( item == 1 )
// penStyle = wxTRANSPARENT; // penStyle = wxPENSTYLE_TRANSPARENT;
// else if ( item == 2 ) // else if ( item == 2 )
// penStyle = wxDOT; // penStyle = wxPENSTYLE_DOT;
// else if ( item == 3 ) // else if ( item == 3 )
// penStyle = wxLONG_DASH; // penStyle = wxPENSTYLE_LONG_DASH;
// else if ( item == 4 ) // else if ( item == 4 )
// penStyle = wxSHORT_DASH; // penStyle = wxPENSTYLE_SHORT_DASH;
if ( item == 0 ) if ( item == 0 )
penStyle = wxDOT_DASH; penStyle = wxPENSTYLE_DOT_DASH;
else if ( item == 1 ) else if ( item == 1 )
penStyle = wxBDIAGONAL_HATCH; penStyle = wxPENSTYLE_BDIAGONAL_HATCH;
else if ( item == 2 ) else if ( item == 2 )
penStyle = wxCROSSDIAG_HATCH; penStyle = wxPENSTYLE_CROSSDIAG_HATCH;
// else if ( item == 8 ) // else if ( item == 8 )
// penStyle = wxFDIAGONAL_HATCH; // penStyle = wxPENSTYLE_FDIAGONAL_HATCH;
// else if ( item == 9 ) // else if ( item == 9 )
// penStyle = wxCROSS_HATCH; // penStyle = wxPENSTYLE_CROSS_HATCH;
// else if ( item == 10 ) // else if ( item == 10 )
// penStyle = wxHORIZONTAL_HATCH; // penStyle = wxPENSTYLE_HORIZONTAL_HATCH;
// else if ( item == 11 ) // else if ( item == 11 )
// penStyle = wxVERTICAL_HATCH; // penStyle = wxPENSTYLE_VERTICAL_HATCH;
wxPen pen( dc.GetTextForeground(), 3, penStyle ); wxPen pen( dc.GetTextForeground(), 3, penStyle );