X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fba44b4103530bd7904c4b5720b7568b753daec..c1aa5517acff9ce039adcd6502db2e88cdd886c7:/src/os2/dcclient.cpp diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index 566e3d59a0..24de249cc2 100644 --- a/src/os2/dcclient.cpp +++ b/src/os2/dcclient.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.cpp +// Name: src/os2/dcclient.cpp // Purpose: wxClientDC class // Author: David Webster // Modified by: @@ -20,15 +20,18 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/string.h" +#include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" +#endif + #include "wx/log.h" #include "wx/window.h" #include "wx/app.h" #include "wx/os2/private.h" -#include "wx/dcclient.h" - // ---------------------------------------------------------------------------- // array/list types // ---------------------------------------------------------------------------- @@ -172,15 +175,15 @@ void wxWindowDC::InitDC() vColor.Set( wxT("WHITE") ); m_brush.SetColour(vColor); InitializePalette(); - wxFont* pFont = new wxFont( 12 - ,wxNORMAL + wxFont* pFont = new wxFont( 10 + ,wxMODERN ,wxNORMAL ,wxBOLD ); SetFont(*pFont); delete pFont; // - // OS/2 default vertical character allignment needs to match the other OS's + // OS/2 default vertical character alignment needs to match the other OS's // ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM); @@ -362,7 +365,7 @@ wxPaintDC::wxPaintDC( ); } - m_bIsPaintTime = TRUE; + m_bIsPaintTime = true; ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this)); } InitDC(); @@ -383,7 +386,7 @@ wxPaintDC::~wxPaintDC() { ::WinEndPaint(m_hPS); m_hPS = m_hOldPS; - m_bIsPaintTime = FALSE; + m_bIsPaintTime = false; ms_cache.RemoveAt(nIndex); } //else: cached DC entry is still in use @@ -431,4 +434,3 @@ WXHDC wxPaintDC::FindDCInCache( } return 0; } // end of wxPaintDC::FindInCache -