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

use wxPEN/BRUSH_XXX instead of wxXXX (#9812)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-03 11:16:26 +00:00
parent d050da45f8
commit fb0400941f
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/generic/graphicc.cpp
View File

@@ -479,32 +479,32 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
switch ( m_pen.GetStyle() ) switch ( m_pen.GetStyle() )
{ {
case wxSOLID : case wxPENSTYLE_SOLID :
break; break;
case wxDOT : case wxPENSTYLE_DOT :
m_count = WXSIZEOF(dotted); m_count = WXSIZEOF(dotted);
m_userLengths = new double[ m_count ] ; m_userLengths = new double[ m_count ] ;
memcpy( m_userLengths, dotted, sizeof(dotted) ); memcpy( m_userLengths, dotted, sizeof(dotted) );
m_lengths = m_userLengths; m_lengths = m_userLengths;
break; break;
case wxLONG_DASH : case wxPENSTYLE_LONG_DASH :
m_lengths = dashed ; m_lengths = dashed ;
m_count = WXSIZEOF(dashed); m_count = WXSIZEOF(dashed);
break; break;
case wxSHORT_DASH : case wxPENSTYLE_SHORT_DASH :
m_lengths = short_dashed ; m_lengths = short_dashed ;
m_count = WXSIZEOF(short_dashed); m_count = WXSIZEOF(short_dashed);
break; break;
case wxDOT_DASH : case wxPENSTYLE_DOT_DASH :
m_lengths = dotted_dashed ; m_lengths = dotted_dashed ;
m_count = WXSIZEOF(dotted_dashed); m_count = WXSIZEOF(dotted_dashed);
break; break;
case wxUSER_DASH : case wxPENSTYLE_USER_DASH :
{ {
wxDash *wxdashes ; wxDash *wxdashes ;
m_count = m_pen.GetDashes( &wxdashes ) ; m_count = m_pen.GetDashes( &wxdashes ) ;
@@ -524,7 +524,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
m_lengths = m_userLengths ; m_lengths = m_userLengths ;
} }
break; break;
case wxSTIPPLE : case wxPENSTYLE_STIPPLE :
{ {
/* /*
wxBitmap* bmp = pen.GetStipple(); wxBitmap* bmp = pen.GetStipple();
@@ -540,29 +540,30 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
} }
break; break;
default : default :
if ( m_pen.GetStyle() >= wxFIRST_HATCH && m_pen.GetStyle() <= wxLAST_HATCH ) if ( m_pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH
&& m_pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
{ {
/* /*
wxDELETE( m_penBrush ); wxDELETE( m_penBrush );
HatchStyle style = HatchStyleHorizontal; HatchStyle style = HatchStyleHorizontal;
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 ;
@@ -606,7 +607,7 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush
m_blue = brush.GetColour().Blue()/255.0; m_blue = brush.GetColour().Blue()/255.0;
m_alpha = brush.GetColour().Alpha()/255.0; m_alpha = brush.GetColour().Alpha()/255.0;
/* /*
if ( brush.GetStyle() == wxSOLID) if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID)
{ {
m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() , m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
brush.GetColour().Green() , brush.GetColour().Blue() ) ); brush.GetColour().Green() , brush.GetColour().Blue() ) );
@@ -616,22 +617,22 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush
HatchStyle style = HatchStyleHorizontal; HatchStyle style = HatchStyleHorizontal;
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 ;