fixing osx_carbon

[wxWidgets.git] / src / os2 / dcclient.cpp

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 11160fbf97b95d9d4eb7ca7bf63aeb554a769d67..ce890dab9e8badf7d9378332a28deb03b4ce91ea 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -62,13 +62,13 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo);
 
 static RECT        g_paintStruct;
 
 
 static RECT        g_paintStruct;
 

-#ifdef __WXDEBUG__
+#ifdef wxHAS_PAINT_DEBUG

     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
     // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
     // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;

-#endif // __WXDEBUG__
+#endif // wxHAS_PAINT_DEBUG

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -114,7 +114,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow* pTheCanvas) :
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError(_T("Unable to create presentation space. Error: %s\n"), sError.c_str());
+        wxLogError(wxT("Unable to create presentation space. Error: %s\n"), sError.c_str());

     }
     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
     }
     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);


@@ -132,7 +132,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow* pTheCanvas) :
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError(_T("Unable to set current color table (3). Error: %s\n"), sError.c_str());
+        wxLogError(wxT("Unable to set current color table (3). Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L


@@ -182,7 +182,7 @@ void wxWindowDCImpl::DoGetSize(
 , int*                              pnHeight
 ) const
 {
 , int*                              pnHeight
 ) const
 {

-    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    wxCHECK_RET( m_pCanvas, wxT("wxWindowDC without a window?") );

     m_pCanvas->GetSize( pnWidth
                        ,pnHeight
                       );
     m_pCanvas->GetSize( pnWidth
                        ,pnHeight
                       );


@@ -236,7 +236,7 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *pTheCanvas) :
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError(_T("Unable to set current color table (4). Error: %s\n"), sError.c_str());
+        wxLogError(wxT("Unable to set current color table (4). Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L


@@ -282,7 +282,7 @@ void wxClientDCImpl::DoGetSize(
 , int*                              pnHeight
 ) const
 {
 , int*                              pnHeight
 ) const
 {

-    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    wxCHECK_RET( m_pCanvas, wxT("wxWindowDC without a window?") );

     m_pCanvas->GetClientSize( pnWidth
                              ,pnHeight
                             );
     m_pCanvas->GetClientSize( pnWidth
                              ,pnHeight
                             );


@@ -308,13 +308,13 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *pCanvas) :
 {
     wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor"));
 
 {
     wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor"));
 

-#ifdef __WXDEBUG__
+#ifdef wxHAS_PAINT_DEBUG

     if (g_isPainting <= 0)
     {
         wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") );
         return;
     }
     if (g_isPainting <= 0)
     {
         wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") );
         return;
     }

-#endif // __WXDEBUG__
+#endif // wxHAS_PAINT_DEBUG

 
     m_pCanvas = pCanvas;
 
 
     m_pCanvas = pCanvas;