--- nono/wx/wxvideomonitor.h 2026/04/29 17:04:28 1.1.1.1 +++ nono/wx/wxvideomonitor.h 2026/04/29 17:04:37 1.1.1.2 @@ -1,19 +1,20 @@ // // nono -// Copyright (C) 2019 isaki@NetBSD.org +// Copyright (C) 2020 nono project +// Licensed under nono-license.txt // #pragma once -#include "object.h" #include "wxsubwindow.h" +#include "object.h" // // LUNA ビットマップパネル // class WXLunaBitmapPanel : public wxScrolledWindow { - typedef wxScrolledWindow inherited; + using inherited = wxScrolledWindow; public: WXLunaBitmapPanel(wxWindow *parent); virtual ~WXLunaBitmapPanel(); @@ -25,7 +26,7 @@ class WXLunaBitmapPanel : public wxScrol void Draw(); const uint8 *src = NULL; // Bitmap デバイス内のバッファを指す - uint8 *bmpbuf = NULL; // 裏バッファ + std::unique_ptr bmpbuf {}; // 裏バッファ int view_x = 0; // ビューの表示開始 X 座標 int view_y = 0; // ビューの表示開始 Y 座標 @@ -51,7 +52,7 @@ class WXLunaBitmapPanel : public wxScrol // class WXLunaBitmapWindow : public WXSubWindow { - typedef WXSubWindow inherited; + using inherited = WXSubWindow; public: WXLunaBitmapWindow(wxWindow *parent, wxWindowID id, const wxString& name); virtual ~WXLunaBitmapWindow();