summaryrefslogtreecommitdiff
path: root/wx+/dc.h
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2023-05-19 09:24:58 -0400
committerB. Stack <bgstack15@gmail.com>2023-05-19 09:24:58 -0400
commit90bc692185a27f18acb6b029dfaf038e555ef8ff (patch)
treefdb56193bab28d36a4c6723bf847f3aa2ce36a9b /wx+/dc.h
parentadd upstream 12.2 (diff)
downloadFreeFileSync-90bc692185a27f18acb6b029dfaf038e555ef8ff.tar.gz
FreeFileSync-90bc692185a27f18acb6b029dfaf038e555ef8ff.tar.bz2
FreeFileSync-90bc692185a27f18acb6b029dfaf038e555ef8ff.zip
add upstream 12.312.3
Diffstat (limited to 'wx+/dc.h')
-rw-r--r--wx+/dc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/wx+/dc.h b/wx+/dc.h
index a169cffe..5f744282 100644
--- a/wx+/dc.h
+++ b/wx+/dc.h
@@ -13,7 +13,7 @@
#include <wx/dcbuffer.h> //for macro: wxALWAYS_NATIVE_DOUBLE_BUFFER
#include <wx/dcscreen.h>
#include <wx/bmpbndl.h>
-// #include <gtk/gtk.h>
+ // #include <gtk/gtk.h>
namespace zen
@@ -50,12 +50,12 @@ void clearArea(wxDC& dc, const wxRect& rect, const wxColor& col)
//properly draw rectangle respecting high DPI (and avoiding wxPen position fuzzyness)
inline
-void drawInsetRectangle(wxDC& dc, wxRect rect, int borderWidth, const wxColor& borderCol, const wxColor& innerCol)
+void drawFilledRectangle(wxDC& dc, wxRect rect, const wxColor& innerCol, const wxColor& borderCol, int borderWidth)
{
if (rect.width > 0 &&
rect.height > 0)
{
- assert(borderCol.IsSolid() && innerCol.IsSolid());
+ assert(innerCol.IsSolid() && borderCol.IsSolid());
wxDCPenChanger rectPen (dc, *wxTRANSPARENT_PEN);
wxDCBrushChanger rectBrush(dc, borderCol);
dc.DrawRectangle(rect);
@@ -68,7 +68,7 @@ void drawInsetRectangle(wxDC& dc, wxRect rect, int borderWidth, const wxColor& b
inline
-void drawInsetRectangle(wxDC& dc, const wxRect& rect, int borderWidth, const wxColor& col)
+void drawRectangleBorder(wxDC& dc, const wxRect& rect, const wxColor& col, int borderWidth)
{
if (rect.width > 0 &&
rect.height > 0)
bgstack15