[Wgui-cvs] wgui/src wg_application.cpp,1.52,1.53 wg_button.cpp,1.37,1.38 wg_checkbox.cpp,1.22,1.23 w
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2004-07-16 16:41:50
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18181/src Modified Files: wg_application.cpp wg_button.cpp wg_checkbox.cpp wg_color.cpp wg_dropdown.cpp wg_editbox.cpp wg_groupbox.cpp wg_label.cpp wg_listbox.cpp wg_menu.cpp wg_progress.cpp wg_scrollbar.cpp wg_textbox.cpp wg_toolbar.cpp wg_tooltip.cpp wg_view.cpp wg_window.cpp Log Message: Draw architecture changes. Index: wg_view.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_view.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wg_view.cpp 7 Jul 2004 21:03:55 -0000 1.41 --- wg_view.cpp 16 Jul 2004 16:41:36 -0000 1.42 *************** *** 167,173 **** } ! m_ClientRect = CRect(m_ClientRect.Left(), m_ClientRect.Top(), ! m_WindowRect.Width(), m_WindowRect.Height()); ! m_ClientRect.ClipTo(m_WindowRect); m_pScreenSurface = SDL_SetVideoMode(m_WindowRect.Width(), m_WindowRect.Height(), DEFAULT_BPP, iFlags); --- 167,172 ---- } ! m_ClientRect = CRect(m_ClientRect.Left(), m_ClientRect.Top(), m_WindowRect.Width(), m_WindowRect.Height()); ! m_ClientRect.ClipTo(m_WindowRect.SizeRect()); m_pScreenSurface = SDL_SetVideoMode(m_WindowRect.Width(), m_WindowRect.Height(), DEFAULT_BPP, iFlags); Index: wg_button.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_button.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wg_button.cpp 6 Jul 2004 03:29:02 -0000 1.37 --- wg_button.cpp 16 Jul 2004 16:41:36 -0000 1.38 *************** *** 52,56 **** m_pFontEngine, sText, CRenderedString::VALIGN_CENTER, CRenderedString::HALIGN_CENTER)); m_pRenderedString = pRenderedString; ! m_BGColor = CApplication::Instance()->GetDefaultFGColor(); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); Draw(); --- 52,56 ---- m_pFontEngine, sText, CRenderedString::VALIGN_CENTER, CRenderedString::HALIGN_CENTER)); m_pRenderedString = pRenderedString; ! m_BackgroundColor = CApplication::Instance()->GetDefaultForegroundColor(); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); Draw(); Index: wg_editbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_editbox.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** wg_editbox.cpp 15 Jul 2004 18:26:14 -0000 1.90 --- wg_editbox.cpp 16 Jul 2004 16:41:36 -0000 1.91 *************** *** 49,53 **** m_bDrawCursor(true) { ! m_BGColor = COLOR_WHITE; m_ClientRect.Grow(-4); if (pFontEngine) --- 49,53 ---- m_bDrawCursor(true) { ! m_BackgroundColor = COLOR_WHITE; m_ClientRect.Grow(-4); if (pFontEngine) *************** *** 84,88 **** void CEditBox::SetReadOnly(bool bReadOnly) { ! m_BGColor = bReadOnly ? COLOR_LIGHTGRAY : COLOR_WHITE; m_bReadOnly = bReadOnly; Draw(); --- 84,88 ---- void CEditBox::SetReadOnly(bool bReadOnly) { ! m_BackgroundColor = bReadOnly ? COLOR_LIGHTGRAY : COLOR_WHITE; m_bReadOnly = bReadOnly; Draw(); Index: wg_checkbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_checkbox.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wg_checkbox.cpp 30 Jun 2004 22:31:01 -0000 1.22 --- wg_checkbox.cpp 16 Jul 2004 16:41:36 -0000 1.23 *************** *** 36,40 **** m_MouseButton(0) { ! m_BGColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); --- 36,40 ---- m_MouseButton(0) { ! m_BackgroundColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Index: wg_tooltip.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_tooltip.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wg_tooltip.cpp 8 Jul 2004 21:42:51 -0000 1.23 --- wg_tooltip.cpp 16 Jul 2004 16:41:36 -0000 1.24 *************** *** 28,32 **** { ! CToolTip::CToolTip(CWindow* pToolWindow, std::string sText, CRGBColor& FontColor, CRGBColor& BGColor, CFontEngine* pFontEngine) : CWindow(CRect(), pToolWindow), m_FontColor(FontColor) --- 28,32 ---- { ! CToolTip::CToolTip(CWindow* pToolWindow, std::string sText, CRGBColor& FontColor, CRGBColor& BackgroundColor, CFontEngine* pFontEngine) : CWindow(CRect(), pToolWindow), m_FontColor(FontColor) *************** *** 52,56 **** m_BoundingRect = CRect(CPoint(0, 0), Dims + CPoint(4, 4)); ! m_BGColor = BGColor; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER); --- 52,56 ---- m_BoundingRect = CRect(CPoint(0, 0), Dims + CPoint(4, 4)); ! m_BackgroundColor = BackgroundColor; CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER); Index: wg_progress.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_progress.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wg_progress.cpp 30 Jun 2004 22:31:01 -0000 1.15 --- wg_progress.cpp 16 Jul 2004 16:41:36 -0000 1.16 *************** *** 35,39 **** m_BarColor(BarColor) { ! m_BGColor = DEFAULT_FG_COLOR; Draw(); } --- 35,39 ---- m_BarColor(BarColor) { ! m_BackgroundColor = DEFAULT_FOREGROUND_COLOR; Draw(); } Index: wg_color.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_color.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wg_color.cpp 2 Apr 2004 17:26:16 -0000 1.17 --- wg_color.cpp 16 Jul 2004 16:41:36 -0000 1.18 *************** *** 60,65 **** blue = 0xFF; bInitted = true; ! } ! if (s == "LIGHTGRAY") { --- 60,65 ---- blue = 0xFF; bInitted = true; ! } ! if (s == "LIGHTGRAY") { *************** *** 174,179 **** ! CRGBColor DEFAULT_BG_COLOR = CRGBColor(0x60, 0x60, 0x60); ! CRGBColor DEFAULT_FG_COLOR = CRGBColor(0xA0, 0xA0, 0xA0); CRGBColor DEFAULT_LINE_COLOR = CRGBColor(0x00, 0x00, 0x00); CRGBColor DEFAULT_DISABLED_LINE_COLOR = CRGBColor(0x40, 0x40, 0x40); --- 174,179 ---- ! CRGBColor DEFAULT_BACKGROUND_COLOR = CRGBColor(0x60, 0x60, 0x60); ! CRGBColor DEFAULT_FOREGROUND_COLOR = CRGBColor(0xA0, 0xA0, 0xA0); CRGBColor DEFAULT_LINE_COLOR = CRGBColor(0x00, 0x00, 0x00); CRGBColor DEFAULT_DISABLED_LINE_COLOR = CRGBColor(0x40, 0x40, 0x40); Index: wg_application.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_application.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wg_application.cpp 28 Apr 2004 15:41:46 -0000 1.52 --- wg_application.cpp 16 Jul 2004 16:41:36 -0000 1.53 *************** *** 97,103 **** m_pMouseFocusWindow(0), m_pDefaultFontEngine(0), ! m_DefaultColorBG(DEFAULT_BG_COLOR), ! m_DefaultColorFG(DEFAULT_FG_COLOR), ! m_DefaultColorSelect(DEFAULT_BG_COLOR), m_bHandleExceptionsInternally(bHandleExceptionsInternally), m_bResourcePoolEnabled(true), --- 97,103 ---- m_pMouseFocusWindow(0), m_pDefaultFontEngine(0), ! m_DefaultBackgroundColor(DEFAULT_BACKGROUND_COLOR), ! m_DefaultForegroundColor(DEFAULT_FOREGROUND_COLOR), ! m_DefaultSelectionColor(DEFAULT_BACKGROUND_COLOR), m_bHandleExceptionsInternally(bHandleExceptionsInternally), m_bResourcePoolEnabled(true), *************** *** 236,250 **** if (m_GlobalConfig.EntryExists("BACKGROUNDCOLOR")) { ! m_DefaultColorBG = CRGBColor(m_GlobalConfig.GetStringEntry("BACKGROUNDCOLOR").second); } if (m_GlobalConfig.EntryExists("FOREGROUNDCOLOR")) { ! m_DefaultColorFG = CRGBColor(m_GlobalConfig.GetStringEntry("FOREGROUNDCOLOR").second); } if (m_GlobalConfig.EntryExists("SELECTIONCOLOR")) { ! m_DefaultColorSelect = CRGBColor(m_GlobalConfig.GetStringEntry("SELECTIONCOLOR").second); } --- 236,250 ---- if (m_GlobalConfig.EntryExists("BACKGROUNDCOLOR")) { ! m_DefaultBackgroundColor = CRGBColor(m_GlobalConfig.GetStringEntry("BACKGROUNDCOLOR").second); } if (m_GlobalConfig.EntryExists("FOREGROUNDCOLOR")) { ! m_DefaultForegroundColor = CRGBColor(m_GlobalConfig.GetStringEntry("FOREGROUNDCOLOR").second); } if (m_GlobalConfig.EntryExists("SELECTIONCOLOR")) { ! m_DefaultSelectionColor = CRGBColor(m_GlobalConfig.GetStringEntry("SELECTIONCOLOR").second); } Index: wg_groupbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_groupbox.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wg_groupbox.cpp 1 Jul 2004 17:00:35 -0000 1.17 --- wg_groupbox.cpp 16 Jul 2004 16:41:36 -0000 1.18 *************** *** 49,53 **** m_pFontEngine, sText, CRenderedString::VALIGN_TOP, CRenderedString::HALIGN_LEFT)); m_pRenderedString = pRenderedString; ! m_BGColor = CApplication::Instance()->GetDefaultBGColor(); Draw(); } --- 49,53 ---- m_pFontEngine, sText, CRenderedString::VALIGN_TOP, CRenderedString::HALIGN_LEFT)); m_pRenderedString = pRenderedString; ! m_BackgroundColor = CApplication::Instance()->GetDefaultBackgroundColor(); Draw(); } *************** *** 70,74 **** m_pRenderedString->GetMetrics(&Dims, &Offset, 0); Painter.DrawRect(CRect(CPoint(6, 0), CPoint(14, 0) + Dims), ! true, m_BGColor, m_BGColor); m_pRenderedString->Draw(m_pSDLSurface, m_WindowRect.SizeRect(), CPoint(10, 0), m_FontColor); } --- 70,74 ---- m_pRenderedString->GetMetrics(&Dims, &Offset, 0); Painter.DrawRect(CRect(CPoint(6, 0), CPoint(14, 0) + Dims), ! true, m_BackgroundColor, m_BackgroundColor); m_pRenderedString->Draw(m_pSDLSurface, m_WindowRect.SizeRect(), CPoint(10, 0), m_FontColor); } Index: wg_dropdown.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_dropdown.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wg_dropdown.cpp 15 Jul 2004 18:26:14 -0000 1.25 --- wg_dropdown.cpp 16 Jul 2004 16:41:36 -0000 1.26 *************** *** 42,46 **** m_pEditBox->SetReadOnly(true); // Override the normal read-only BG color ! m_pEditBox->SetBGColor(COLOR_WHITE); } --- 42,46 ---- m_pEditBox->SetReadOnly(true); // Override the normal read-only BG color ! m_pEditBox->SetBackgroundColor(COLOR_WHITE); } Index: wg_scrollbar.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_scrollbar.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wg_scrollbar.cpp 7 Jul 2004 21:03:55 -0000 1.40 --- wg_scrollbar.cpp 16 Jul 2004 16:41:36 -0000 1.41 *************** *** 41,45 **** m_bDragging(false) { ! m_BGColor = CApplication::Instance()->GetDefaultFGColor(); switch (m_ScrollBarType) { --- 41,45 ---- m_bDragging(false) { ! m_BackgroundColor = CApplication::Instance()->GetDefaultForegroundColor(); switch (m_ScrollBarType) { *************** *** 100,104 **** CRect SubRect(m_ThumbRect); SubRect.Grow(-1); ! Painter.DrawRect(SubRect, true, COLOR_LIGHTGRAY, m_BGColor); Painter.DrawHLine(SubRect.Left(), SubRect.Right(), SubRect.Bottom(), COLOR_DARKGRAY); Painter.DrawVLine(SubRect.Top(), SubRect.Bottom(), SubRect.Right(), COLOR_DARKGRAY); --- 100,104 ---- CRect SubRect(m_ThumbRect); SubRect.Grow(-1); ! Painter.DrawRect(SubRect, true, COLOR_LIGHTGRAY, m_BackgroundColor); Painter.DrawHLine(SubRect.Left(), SubRect.Right(), SubRect.Bottom(), COLOR_DARKGRAY); Painter.DrawVLine(SubRect.Top(), SubRect.Bottom(), SubRect.Right(), COLOR_DARKGRAY); Index: wg_menu.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_menu.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wg_menu.cpp 15 Jul 2004 18:26:15 -0000 1.51 --- wg_menu.cpp 16 Jul 2004 16:41:36 -0000 1.52 *************** *** 44,48 **** m_pActivePopup(0), m_hRightArrowBitmap(WGRES_RIGHT_ARROW_BITMAP), ! m_HighlightColor(DEFAULT_BG_COLOR), m_pPopupTimer(0) { --- 44,48 ---- m_pActivePopup(0), m_hRightArrowBitmap(WGRES_RIGHT_ARROW_BITMAP), ! m_HighlightColor(DEFAULT_BACKGROUND_COLOR), m_pPopupTimer(0) { *************** *** 77,80 **** --- 77,81 ---- std::make_pair(MenuItem, std::make_pair(CRenderedString(m_pFontEngine, MenuItem.sItemText, CRenderedString::VALIGN_TOP), CRect()))); m_bCachedRectsValid = false; + Draw(); } *************** *** 140,152 **** if (iter->second.second.HitTest(WindowPoint) == CRect::RELPOS_INSIDE && !iter->first.bSpacer) { ! if (m_pHighlightedItem != &(iter->first)) ! { ! m_pPopupTimer->StopTimer(); ! m_pHighlightedItem = &(iter->first); ! if (iter->first.pPopup) ! { ! m_pPopupTimer->StartTimer(1000); ! } ! } break; } --- 141,145 ---- if (iter->second.second.HitTest(WindowPoint) == CRect::RELPOS_INSIDE && !iter->first.bSpacer) { ! m_pHighlightedItem = &(iter->first); break; } *************** *** 154,157 **** --- 147,155 ---- if (pOldHighlight != m_pHighlightedItem) { + m_pPopupTimer->StopTimer(); + if (m_pHighlightedItem->pPopup) + { + m_pPopupTimer->StartTimer(1000); + } Draw(); } *************** *** 226,229 **** --- 224,228 ---- MenuItem.pPopup->SetParentMenu(this); } + Draw(); } *************** *** 300,303 **** --- 299,327 ---- case CMessage::MOUSE_MOVE: { + CMouseMessage* pMouseMessage = dynamic_cast<CMouseMessage*>(pMessage); + if (m_bVisible && pMouseMessage && m_WindowRect.HitTest(ViewToWindow(pMouseMessage->Point)) == CRect::RELPOS_INSIDE) + { + UpdateCachedRects(); + SMenuItem* pOldHighlight = m_pHighlightedItem; + m_pHighlightedItem = 0; + CPoint WindowPoint(ViewToWindow(pMouseMessage->Point)); + for (t_MenuItemVector::iterator iter = m_MenuItems.begin(); iter != m_MenuItems.end(); ++iter) + { + if (iter->second.second.HitTest(WindowPoint) == CRect::RELPOS_INSIDE && !iter->first.bSpacer) + { + m_pHighlightedItem = &(iter->first); + break; + } + } + if (pOldHighlight != m_pHighlightedItem) + { + Draw(); + } + } + else if (m_pHighlightedItem != 0) + { + m_pHighlightedItem = 0; + Draw(); + } break; } Index: wg_window.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_window.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** wg_window.cpp 15 Jul 2004 18:26:15 -0000 1.50 --- wg_window.cpp 16 Jul 2004 16:41:36 -0000 1.51 *************** *** 41,45 **** m_sWindowText(""), m_WindowRect(WindowRect), ! m_BGColor(DEFAULT_BG_COLOR), m_ClientRect(WindowRect.SizeRect()), m_pParentWindow(0), --- 41,45 ---- m_sWindowText(""), m_WindowRect(WindowRect), ! m_BackgroundColor(DEFAULT_BACKGROUND_COLOR), m_ClientRect(WindowRect.SizeRect()), m_pParentWindow(0), *************** *** 53,57 **** SetWindowRect(WindowRect); ! m_BGColor = CApplication::Instance()->GetDefaultBGColor(); SetNewParent(pParent); } --- 53,57 ---- SetWindowRect(WindowRect); ! m_BackgroundColor = CApplication::Instance()->GetDefaultBackgroundColor(); SetNewParent(pParent); } *************** *** 243,247 **** { CPainter Painter(m_pSDLSurface); ! Painter.DrawRect(m_WindowRect.SizeRect(), true, m_BGColor, m_BGColor); CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_PAINT, 0, this)); } --- 243,247 ---- { CPainter Painter(m_pSDLSurface); ! Painter.DrawRect(m_WindowRect.SizeRect(), true, m_BackgroundColor, m_BackgroundColor); CMessageServer::Instance().QueueMessage(new CMessage(CMessage::APP_PAINT, 0, this)); } Index: wg_label.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_label.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wg_label.cpp 25 Jun 2004 19:37:51 -0000 1.19 --- wg_label.cpp 16 Jul 2004 16:41:36 -0000 1.20 *************** *** 46,50 **** m_pFontEngine, sText, CRenderedString::VALIGN_BOTTOM, CRenderedString::HALIGN_LEFT)); m_pRenderedString = pRenderedString; ! m_BGColor = CApplication::Instance()->GetDefaultBGColor(); Draw(); } --- 46,50 ---- m_pFontEngine, sText, CRenderedString::VALIGN_BOTTOM, CRenderedString::HALIGN_LEFT)); m_pRenderedString = pRenderedString; ! m_BackgroundColor = CApplication::Instance()->GetDefaultBackgroundColor(); Draw(); } Index: wg_toolbar.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_toolbar.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wg_toolbar.cpp 30 Jun 2004 22:31:02 -0000 1.15 --- wg_toolbar.cpp 16 Jul 2004 16:41:36 -0000 1.16 *************** *** 35,39 **** CWindow(WindowRect, pParent) { ! m_BGColor = COLOR_LIGHTGRAY; CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Draw(); --- 35,39 ---- CWindow(WindowRect, pParent) { ! m_BackgroundColor = COLOR_LIGHTGRAY; CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_LCLICK); Draw(); Index: wg_listbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_listbox.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wg_listbox.cpp 15 Jul 2004 18:26:15 -0000 1.44 --- wg_listbox.cpp 16 Jul 2004 16:41:36 -0000 1.45 *************** *** 56,60 **** m_pVScrollbar->SetMaxLimit(0); m_ClientRect = CRect(2, 2, m_WindowRect.Width() - 16, m_WindowRect.Height() - 4); ! m_BGColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::KEYBOARD_KEYDOWN); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE); --- 56,60 ---- m_pVScrollbar->SetMaxLimit(0); m_ClientRect = CRect(2, 2, m_WindowRect.Width() - 16, m_WindowRect.Height() - 4); ! m_BackgroundColor = COLOR_WHITE; CMessageServer::Instance().RegisterMessageClient(this, CMessage::KEYBOARD_KEYDOWN); CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_VALUECHANGE); Index: wg_textbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_textbox.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wg_textbox.cpp 15 Jul 2004 18:26:15 -0000 1.24 --- wg_textbox.cpp 16 Jul 2004 16:41:36 -0000 1.25 *************** *** 52,56 **** m_bScrollToCursor(false) { ! m_BGColor = COLOR_WHITE; m_ClientRect = CRect(3, 3, m_WindowRect.Width() - 17, m_WindowRect.Height() - 17); if (pFontEngine) --- 52,56 ---- m_bScrollToCursor(false) { ! m_BackgroundColor = COLOR_WHITE; m_ClientRect = CRect(3, 3, m_WindowRect.Width() - 17, m_WindowRect.Height() - 17); if (pFontEngine) *************** *** 100,104 **** void CTextBox::SetReadOnly(bool bReadOnly) // virtual { ! m_BGColor = bReadOnly ? COLOR_LIGHTGRAY : COLOR_WHITE; m_bReadOnly = bReadOnly; Draw(); --- 100,104 ---- void CTextBox::SetReadOnly(bool bReadOnly) // virtual { ! m_BackgroundColor = bReadOnly ? COLOR_LIGHTGRAY : COLOR_WHITE; m_bReadOnly = bReadOnly; Draw(); |