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

Use wxPENSTYLE_XXX and wxBRUSHSTYLE_XXX instead of wxXXX constants.

Browse Source 
Use non-deprecated constants in wxMSW wxGC code.

Closes #13109.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-04-02 16:37:44 +00:00
parent 554895848b
commit f645356813
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/msw/graphics.cpp
View File

@ -594,25 +594,25 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
DashStyle dashStyle = DashStyleSolid; DashStyle dashStyle = DashStyleSolid;
switch ( pen.GetStyle() ) switch ( pen.GetStyle() )
{ {
case wxSOLID : case wxPENSTYLE_SOLID :
break; break;
case wxDOT : case wxPENSTYLE_DOT :
dashStyle = DashStyleDot; dashStyle = DashStyleDot;
break; break;
case wxLONG_DASH : case wxPENSTYLE_LONG_DASH :
dashStyle = DashStyleDash; // TODO verify dashStyle = DashStyleDash; // TODO verify
break; break;
case wxSHORT_DASH : case wxPENSTYLE_SHORT_DASH :
dashStyle = DashStyleDash; dashStyle = DashStyleDash;
break; break;
case wxDOT_DASH : case wxPENSTYLE_DOT_DASH :
dashStyle = DashStyleDashDot; dashStyle = DashStyleDashDot;
break; break;
case wxUSER_DASH : case wxPENSTYLE_USER_DASH :
{ {
dashStyle = DashStyleCustom; dashStyle = DashStyleCustom;
wxDash *dashes; wxDash *dashes;
@ -629,7 +629,7 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
} }
} }
break; break;
case wxSTIPPLE : case wxPENSTYLE_STIPPLE :
{ {
wxBitmap* bmp = pen.GetStipple(); wxBitmap* bmp = pen.GetStipple();
if ( bmp && bmp->Ok() ) if ( bmp && bmp->Ok() )
@ -648,30 +648,32 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
} }
break; break;
default : default :
if ( pen.GetStyle() >= wxFIRST_HATCH && pen.GetStyle() <= wxLAST_HATCH ) if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH &&
pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
{ {
HatchStyle style = HatchStyleHorizontal; HatchStyle style;
switch( pen.GetStyle() ) switch( pen.GetStyle() )
{ {
case wxBDIAGONAL_HATCH : case wxPENSTYLE_BDIAGONAL_HATCH :
style = HatchStyleBackwardDiagonal; style = HatchStyleBackwardDiagonal;
break ; break ;
case wxCROSSDIAG_HATCH : case wxPENSTYLE_CROSSDIAG_HATCH :
style = HatchStyleDiagonalCross; style = HatchStyleDiagonalCross;
break ; break ;
case wxFDIAGONAL_HATCH : case wxPENSTYLE_FDIAGONAL_HATCH :
style = HatchStyleForwardDiagonal; style = HatchStyleForwardDiagonal;
break ; break ;
case wxCROSS_HATCH : case wxPENSTYLE_CROSS_HATCH :
style = HatchStyleCross; style = HatchStyleCross;
break ; break ;
case wxHORIZONTAL_HATCH : case wxPENSTYLE_HORIZONTAL_HATCH :
style = HatchStyleHorizontal; style = HatchStyleHorizontal;
break ; break ;
case wxVERTICAL_HATCH : case wxPENSTYLE_VERTICAL_HATCH :
style = HatchStyleVertical; style = HatchStyleVertical;
break ; break ;
default:
style = HatchStyleHorizontal;
} }
m_penBrush = new HatchBrush m_penBrush = new HatchBrush
( (
@ -707,28 +709,29 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB
} }
else if ( brush.IsHatch() ) else if ( brush.IsHatch() )
{ {
HatchStyle style = HatchStyleHorizontal; HatchStyle style;
switch( brush.GetStyle() ) switch( brush.GetStyle() )
{ {
case wxBDIAGONAL_HATCH : case wxBRUSHSTYLE_BDIAGONAL_HATCH :
style = HatchStyleBackwardDiagonal; style = HatchStyleBackwardDiagonal;
break ; break ;
case wxCROSSDIAG_HATCH : case wxBRUSHSTYLE_CROSSDIAG_HATCH :
style = HatchStyleDiagonalCross; style = HatchStyleDiagonalCross;
break ; break ;
case wxFDIAGONAL_HATCH : case wxBRUSHSTYLE_FDIAGONAL_HATCH :
style = HatchStyleForwardDiagonal; style = HatchStyleForwardDiagonal;
break ; break ;
case wxCROSS_HATCH : case wxBRUSHSTYLE_CROSS_HATCH :
style = HatchStyleCross; style = HatchStyleCross;
break ; break ;
case wxHORIZONTAL_HATCH : case wxBRUSHSTYLE_HORIZONTAL_HATCH :
style = HatchStyleHorizontal; style = HatchStyleHorizontal;
break ; break ;
case wxVERTICAL_HATCH : case wxBRUSHSTYLE_VERTICAL_HATCH :
style = HatchStyleVertical; style = HatchStyleVertical;
break ; break ;
default:
style = HatchStyleHorizontal;
} }
m_brush = new HatchBrush m_brush = new HatchBrush
( (