X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c354beeafacc20831ce76e266703d07f27e826c7..92dda0f7a31fdfeed083cd285b2900e6e9a83a0b:/src/os2/dcclient.cpp diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index 4bb99210df..db4fb34562 100644 --- a/src/os2/dcclient.cpp +++ b/src/os2/dcclient.cpp @@ -125,7 +125,7 @@ wxWindowDC::wxWindowDC( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); + wxLogError("Unable to set current color table. Error: %s\n", sError.c_str()); } ::GpiCreateLogColorTable( m_hPS ,0L @@ -142,7 +142,6 @@ wxWindowDC::wxWindowDC( void wxWindowDC::InitDC() { - wxColour vColor; // // The background mode is only used for text background and is set in @@ -155,9 +154,10 @@ void wxWindowDC::InitDC() // SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); - vColor.InitFromName("BLACK"); + wxColour vColor( wxT("BLACK") ); m_pen.SetColour(vColor); - vColor.Set("WHITE"); + + vColor.Set( wxT("WHITE") ); m_brush.SetColour(vColor); InitializePalette(); wxFont* pFont = new wxFont( 12 @@ -225,7 +225,7 @@ wxClientDC::wxClientDC( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Unable to set current color table. Error: %s\n", sError); + wxLogError("Unable to set current color table. Error: %s\n", sError.c_str()); } ::GpiCreateLogColorTable( m_hPS ,0L @@ -319,12 +319,14 @@ wxPaintDC::wxPaintDC( { HPS hPS; + m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas)); hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas) ,NULLHANDLE ,&g_paintStruct ); if(hPS) { + ::GpiAssociate(hPS, m_hDC); m_hOldPS = m_hPS; m_hPS = hPS; ::GpiCreateLogColorTable( m_hPS @@ -349,7 +351,6 @@ wxPaintDC::wxPaintDC( } m_bIsPaintTime = TRUE; - m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this)); } InitDC();