From d818458781869bebbd4ac42a886e979f93134db7 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 4 Feb 2009 16:30:27 +0000 Subject: [PATCH] add standard wxBLUE_PEN for coherency with the colours available for standard brushes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gdicmn.h | 2 ++ interface/wx/brush.h | 14 +++++++++++--- interface/wx/pen.h | 13 +++++++------ src/common/gdicmn.cpp | 3 +++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index eb299a4687..4defdb538e 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -782,6 +782,7 @@ public: FONT_SWISS, PEN_BLACK, PEN_BLACKDASHED, + PEN_BLUE, PEN_CYAN, PEN_GREEN, PEN_GREY, @@ -821,6 +822,7 @@ protected: #define wxBLACK_DASHED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED) #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 wxGREEN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREEN) #define wxGREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREY) diff --git a/interface/wx/brush.h b/interface/wx/brush.h index b0384651fb..3551a1d725 100644 --- a/interface/wx/brush.h +++ b/interface/wx/brush.h @@ -82,9 +82,17 @@ enum wxBrushStyle @category{gdi} @stdobjects - ::wxNullBrush, ::wxBLUE_BRUSH, ::wxGREEN_BRUSH, ::wxWHITE_BRUSH, - ::wxBLACK_BRUSH, ::wxGREY_BRUSH, ::wxMEDIUM_GREY_BRUSH, ::wxLIGHT_GREY_BRUSH, - ::wxTRANSPARENT_BRUSH, ::wxCYAN_BRUSH, ::wxRED_BRUSH + @li ::wxNullBrush + @li ::wxBLACK_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 */ diff --git a/interface/wx/pen.h b/interface/wx/pen.h index 97e940d15f..86775db3a9 100644 --- a/interface/wx/pen.h +++ b/interface/wx/pen.h @@ -129,16 +129,17 @@ enum wxPenCap @stdobjects @li ::wxNullPen - @li ::wxRED_PEN + @li ::wxBLACK_DASHED_PEN + @li ::wxBLACK_PEN + @li ::wxBLUE_PEN @li ::wxCYAN_PEN @li ::wxGREEN_PEN - @li ::wxBLACK_PEN - @li ::wxWHITE_PEN - @li ::wxTRANSPARENT_PEN - @li ::wxBLACK_DASHED_PEN @li ::wxGREY_PEN - @li ::wxMEDIUM_GREY_PEN @li ::wxLIGHT_GREY_PEN + @li ::wxMEDIUM_GREY_PEN + @li ::wxRED_PEN + @li ::wxTRANSPARENT_PEN + @li ::wxWHITE_PEN @see wxPenList, wxDC, wxDC::SetPen() */ diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index b6c49d06c7..2d123c899f 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -671,6 +671,9 @@ const wxPen* wxStockGDI::GetPen(Item item) case PEN_BLACKDASHED: pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH); break; + case PEN_BLUE: + pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID); + break; case PEN_CYAN: pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID); break; -- 2.45.2