--- nono/wx/wxtextscreen.h 2026/04/29 17:04:28 1.1 +++ nono/wx/wxtextscreen.h 2026/04/29 17:04:37 1.1.1.2 @@ -1,6 +1,7 @@ // // nono -// Copyright (C) 2018 isaki@NetBSD.org +// Copyright (C) 2020 nono project +// Licensed under nono-license.txt // #pragma once @@ -18,7 +19,7 @@ // class WXTextScreen : public WXTextPanel { - typedef WXTextPanel inherited; + using inherited = WXTextPanel; public: WXTextScreen(wxWindow *parent, int col, int row, const uint16 *textbuf); @@ -36,11 +37,11 @@ class WXTextScreen : public WXTextPanel private: void Draw(wxDC& dc); - const uint16 *textbuf = NULL; - uint16 *prevbuf = NULL; - uint8 *bmpbuf = NULL; - wxImage *image = NULL; - wxBitmap *bitmap = NULL; + const uint16 *textbuf {}; + std::unique_ptr prevbuf {}; + std::unique_ptr bmpbuf {}; + std::unique_ptr image {}; + std::unique_ptr bitmap {}; int col = 0; int row = 0;