--- nono/wx/wxtextpanel.h 2026/04/29 17:05:08 1.1.1.7 +++ nono/wx/wxtextpanel.h 2026/04/29 17:05:58 1.1.1.10 @@ -28,9 +28,11 @@ class WXTextPanel : public WXBitmapPanel static const int FG = 1; public: - WXTextPanel(wxWindow *parent, const wxSize& size = wxDefaultSize, + WXTextPanel(wxWindow *parent, wxWindowID id = wxID_ANY, + const wxPoint& position = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL); - virtual ~WXTextPanel() override; + ~WXTextPanel() override; // フォント変更通知 virtual void FontChanged(); @@ -38,7 +40,6 @@ class WXTextPanel : public WXBitmapPanel int GetFontWidth() const { return font_width; } int GetFontHeight() const { return font_height; } - protected: // テキスト色を指定 void ResetTextColor(); void SetTextColor(Color fg, Color bg); @@ -60,6 +61,7 @@ class WXTextPanel : public WXBitmapPanel // 全角1文字を描画 void DrawChar2(int px, int py, uint code, uint attr = TA::Normal); + protected: // フォントサイズ int font_width {}; int font_height {};