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

add standard wxBLUE_PEN for coherency with the colours available for standard brushes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-04 16:30:27 +00:00
parent c77c302300
commit d818458781
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gdicmn.h
View File

@@ -782,6 +782,7 @@ public:
FONT_SWISS, FONT_SWISS,
PEN_BLACK, PEN_BLACK,
PEN_BLACKDASHED, PEN_BLACKDASHED,
PEN_BLUE,
PEN_CYAN, PEN_CYAN,
PEN_GREEN, PEN_GREEN,
PEN_GREY, PEN_GREY,
@@ -821,6 +822,7 @@ protected:
#define wxBLACK_DASHED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED) #define wxBLACK_DASHED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED)
#define wxBLACK_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACK) #define wxBLACK_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACK)
#define wxBLUE_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLUE)
#define wxCYAN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_CYAN) #define wxCYAN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_CYAN)
#define wxGREEN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREEN) #define wxGREEN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREEN)
#define wxGREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREY) #define wxGREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREY)

14
interface/wx/brush.h
View File

@@ -82,9 +82,17 @@ enum wxBrushStyle
@category{gdi} @category{gdi}
@stdobjects @stdobjects
::wxNullBrush, ::wxBLUE_BRUSH, ::wxGREEN_BRUSH, ::wxWHITE_BRUSH, @li ::wxNullBrush
::wxBLACK_BRUSH, ::wxGREY_BRUSH, ::wxMEDIUM_GREY_BRUSH, ::wxLIGHT_GREY_BRUSH, @li ::wxBLACK_BRUSH
::wxTRANSPARENT_BRUSH, ::wxCYAN_BRUSH, ::wxRED_BRUSH @li ::wxBLUE_BRUSH
@li ::wxCYAN_BRUSH
@li ::wxGREEN_BRUSH
@li ::wxGREY_BRUSH
@li ::wxLIGHT_GREY_BRUSH
@li ::wxMEDIUM_GREY_BRUSH
@li ::wxRED_BRUSH
@li ::wxTRANSPARENT_BRUSH
@li ::wxWHITE_BRUSH
@see wxBrushList, wxDC, wxDC::SetBrush @see wxBrushList, wxDC, wxDC::SetBrush
*/ */

13
interface/wx/pen.h
View File

@@ -129,16 +129,17 @@ enum wxPenCap
@stdobjects @stdobjects
@li ::wxNullPen @li ::wxNullPen
@li ::wxRED_PEN @li ::wxBLACK_DASHED_PEN
@li ::wxBLACK_PEN
@li ::wxBLUE_PEN
@li ::wxCYAN_PEN @li ::wxCYAN_PEN
@li ::wxGREEN_PEN @li ::wxGREEN_PEN
@li ::wxBLACK_PEN
@li ::wxWHITE_PEN
@li ::wxTRANSPARENT_PEN
@li ::wxBLACK_DASHED_PEN
@li ::wxGREY_PEN @li ::wxGREY_PEN
@li ::wxMEDIUM_GREY_PEN
@li ::wxLIGHT_GREY_PEN @li ::wxLIGHT_GREY_PEN
@li ::wxMEDIUM_GREY_PEN
@li ::wxRED_PEN
@li ::wxTRANSPARENT_PEN
@li ::wxWHITE_PEN
@see wxPenList, wxDC, wxDC::SetPen() @see wxPenList, wxDC, wxDC::SetPen()
*/ */

3
src/common/gdicmn.cpp
View File

@@ -671,6 +671,9 @@ const wxPen* wxStockGDI::GetPen(Item item)
case PEN_BLACKDASHED: case PEN_BLACKDASHED:
pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH); pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
break; break;
case PEN_BLUE:
pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID);
break;
case PEN_CYAN: case PEN_CYAN:
pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID); pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
break; break;