rename VirtWnd::Draw() => Paint()

sumatrapdfreader · Aug 13, 2024 · 738b466 · 738b466
1 parent a354c0d
commit 738b466
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/HomePage.cpp b/src/HomePage.cpp
@@ -190,7 +190,7 @@ static Rect DrawHideFrequentlyReadLink(HWND hwnd, HDC hdc, const char* txt) {
     PositionRB(rc, r);
     MoveXY(r, -innerPadding, -innerPadding);
     w.SetBounds(r);
-    w.Draw(hdc);
+    w.Paint(hdc);
 
     // make the click target larger
     r.Inflate(innerPadding, innerPadding);
@@ -867,7 +867,7 @@ static void DrawHomePageLayout(const HomePageLayout& l) {
     color = ThemeWindowTextColor();
     SetTextColor(hdc, color);
 
-    l.freqRead->Draw(hdc);
+    l.freqRead->Paint(hdc);
     SelectObject(hdc, GetStockBrush(NULL_BRUSH));
 
     for (const ThumbnailLayout& thumb : l.thumbnails) {
@@ -913,7 +913,7 @@ static void DrawHomePageLayout(const HomePageLayout& l) {
     int openIconIdx = 0;
     ImageList_Draw(l.himlOpen, openIconIdx, hdc, x, y, ILD_NORMAL);
 
-    l.openDoc->Draw(hdc);
+    l.openDoc->Paint(hdc);
 
     if (false) {
         Rect rcFreqRead = DrawHideFrequentlyReadLink(win->hwndCanvas, hdc, _TRA("Hide frequently read"));

diff --git a/src/wingui/VirtWnd.cpp b/src/wingui/VirtWnd.cpp
@@ -83,7 +83,7 @@ Size VirtWndText::GetIdealSize(bool onlyIfEmpty) {
     return sz;
 }
 
-void VirtWndText::Draw(HDC hdc) {
+void VirtWndText::Paint(HDC hdc) {
     ReportIf(lastBounds.IsEmpty());
     COLORREF prevCol = kColorUnset;
     int prevBkMode = 0;

diff --git a/src/wingui/VirtWnd.h b/src/wingui/VirtWnd.h
@@ -14,7 +14,7 @@ struct VirtWnd : LayoutBase {
 
     virtual Size GetIdealSize();
 
-    void Paint(HDC);
+    virtual void Paint(HDC);
 
     VirtWnd* next = nullptr;
     VirtWnd* firstChild = nullptr;
@@ -46,5 +46,6 @@ struct VirtWndText : VirtWnd {
 
     Size MinIntrinsicSize(int width, int height);
     Size GetIdealSize(bool onlyIfEmpty = false);
-    void Draw(HDC dc);
+
+    void Paint(HDC dc) override;
 };