Added wxFileName.

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

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 75ffabc6ff7b5998f4c8182176a351e9e98e504f..bc20d8ac52456654f89b0e713df4545d62f25e7d 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.cpp
 // Purpose:     wxClientDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.cpp
 // Purpose:     wxClientDC class

-// Author:      Julian Smart
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     09/21/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,22 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "dcclient.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-

 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/window.h"
 
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/window.h"
 

-#include "wx/msw/private.h"
+#include "wx/os2/private.h"

 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 


@@ -42,17 +34,19 @@
 
 struct WXDLLEXPORT wxPaintDCInfo
 {
 
 struct WXDLLEXPORT wxPaintDCInfo
 {

-    wxPaintDCInfo(wxWindow *win, wxDC *dc)
+    wxPaintDCInfo( wxWindow* pWin
+                  ,wxDC*     pDC
+                 )

     {
     {

-        hwnd = win->GetHWND();
-        hdc = dc->GetHDC();
-        count = 1;
+        m_hWnd = pWin->GetHWND();
+        m_hDC = pDC->GetHDC();
+        m_nCount = 1;

     }
 
     }
 

-    WXHWND    hwnd;       // window for this DC
-    WXHDC     hdc;        // the DC handle
-    size_t    count;      // usage count
-};
+    WXHWND                          m_hWnd;   // window for this DC
+    WXHDC                           m_hDC;    // the DC handle
+    size_t                          m_nCount; // usage count
+}; // end of wxPaintDCInfot

 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 


@@ -62,17 +56,15 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo);
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
     IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
     IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)

-#endif

 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 

-static PAINTSTRUCT g_paintStruct;
+static RECT        g_paintStruct;

 
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
 
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only


@@ -92,32 +84,68 @@ static PAINTSTRUCT g_paintStruct;
 
 wxWindowDC::wxWindowDC()
 {
 
 wxWindowDC::wxWindowDC()
 {

-  m_canvas = NULL;
+    m_pCanvas = NULL;

 }
 
 }
 

-wxWindowDC::wxWindowDC(wxWindow *the_canvas)
+wxWindowDC::wxWindowDC(
+  wxWindow*                         pTheCanvas
+)

 {
 {

-  m_canvas = the_canvas;
-  m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(the_canvas) );
-  m_hDCCount++;
+    ERRORID                         vError;
+    wxString                        sError;

 
 

-  SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
+    m_pCanvas = pTheCanvas;
+    m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
+    m_nDCCount++;
+    //
+    // default under PM is that Window and Client DC's are the same
+    // so we offer a separate Presentation Space to use for the
+    // entire window.  Otherwise, calling BeginPaint will just create
+    // chached-micro client presentation space
+    //
+     m_hPS = GpiCreatePS( m_hab
+                         ,m_hDC
+                         ,&m_PageSize
+                         ,PU_PELS | GPIF_LONG | GPIA_ASSOC
+                        );
+    ::GpiAssociate(m_hPS, NULLHANDLE);
+    ::GpiAssociate(m_hPS, m_hDC);
+    // Set the wxWindows color table
+    if (!::GpiCreateLogColorTable( m_hPS
+                                  ,0L
+                                  ,LCOLF_CONSECRGB
+                                  ,0L
+                                  ,(LONG)wxTheColourDatabase->m_nSize
+                                  ,(PLONG)wxTheColourDatabase->m_palTable
+                                 ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Unable to set current color table. Error: %s\n", sError);
+    }
+    SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));

 }
 
 wxWindowDC::~wxWindowDC()
 {
 }
 
 wxWindowDC::~wxWindowDC()
 {

-  if (m_canvas && m_hDC)
-  {
-    SelectOldObjects(m_hDC);
-
-    //
-    // In PM one does not explicitly close or release an open WindowDC
-    // They automatically close with the window, unless explicitly detached
-    //
-    m_hDC = 0;
-  }
+    if (m_pCanvas && m_hDC)
+    {
+        SelectOldObjects(m_hDC);

 
 

-  m_hDCCount--;
+        //
+        // In PM one does not explicitly close or release an open WindowDC
+        // They automatically close with the window, unless explicitly detached
+        // but we need to destroy our PS
+        //
+        if(m_hPS)
+        {
+            ::GpiAssociate(m_hPS, NULLHANDLE);
+            ::GpiDestroyPS(m_hPS);
+        }
+        m_hPS = NULLHANDLE;
+        m_hDC = NULLHANDLE;
+    }
+    m_nDCCount--;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -126,32 +154,64 @@ wxWindowDC::~wxWindowDC()
 
 wxClientDC::wxClientDC()
 {
 
 wxClientDC::wxClientDC()
 {

-  m_canvas = NULL;
+    m_pCanvas = NULL;

 }
 
 }
 

-wxClientDC::wxClientDC(wxWindow *the_canvas)
+wxClientDC::wxClientDC(
+  wxWindow*                         pTheCanvas
+)

 {
 {

-  m_canvas = the_canvas;
-  m_hDC = (WXHDC) ::GetDC(GetWinHwnd(the_canvas));
+    SIZEL                           vSizl = { 0,0};
+    ERRORID                         vError;
+    wxString                        sError;

 
 

-  // the background mode is only used for text background
-  // and is set in DrawText() to OPAQUE as required, other-
-  // wise always TRANSPARENT, RR
-  ::SetBkMode( GetHdc(), TRANSPARENT );
+    m_pCanvas = pTheCanvas;

 
 

-  SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
-}
+    //
+    // default under PM is that Window and Client DC's are the same
+    //
+    m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas));
+    m_hPS = ::GpiCreatePS( wxGetInstance()
+                          ,m_hDC
+                          ,&vSizl
+                          ,PU_PELS | GPIF_LONG | GPIA_ASSOC
+                         );
+
+    // Set the wxWindows color table
+    if (!::GpiCreateLogColorTable( m_hPS
+                                  ,0L
+                                  ,LCOLF_CONSECRGB
+                                  ,0L
+                                  ,(LONG)wxTheColourDatabase->m_nSize
+                                  ,(PLONG)wxTheColourDatabase->m_palTable
+                                 ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Unable to set current color table. Error: %s\n", sError);
+    }
+    //
+    // Default mode is BM_LEAVEALONE so we make no call Set the mix
+    //
+    SetBackground(wxBrush( m_pCanvas->GetBackgroundColour()
+                          ,wxSOLID
+                         )
+                 );
+} // end of wxClientDC::wxClientDC

 
 wxClientDC::~wxClientDC()
 {
 
 wxClientDC::~wxClientDC()
 {

-  if ( m_canvas && GetHdc() )
-  {
-    SelectOldObjects(m_hDC);
+    if ( m_pCanvas && GetHdc() )
+    {
+        SelectOldObjects(m_hDC);

 
 

-    ::ReleaseDC(GetWinHwnd(m_canvas), GetHdc());
-    m_hDC = 0;
-  }
-}
+        //
+        // We don't explicitly release Device contexts in PM and
+        // the cached micro PS is already gone
+        //
+        m_hDC = 0;
+    }
+} // end of wxClientDC::~wxClientDC

 
 // ----------------------------------------------------------------------------
 // wxPaintDC
 
 // ----------------------------------------------------------------------------
 // wxPaintDC


@@ -177,44 +237,79 @@ wxArrayDCInfo wxPaintDC::ms_cache;
 
 wxPaintDC::wxPaintDC()
 {
 
 wxPaintDC::wxPaintDC()
 {

-    m_canvas = NULL;
+    m_pCanvas = NULL;

     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 

-wxPaintDC::wxPaintDC(wxWindow *canvas)
+wxPaintDC::wxPaintDC(
+  wxWindow*                         pCanvas
+)

 {
 {

-    wxCHECK_RET( canvas, _T("NULL canvas in wxPaintDC ctor") );
+    wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor"));
+    RECTL                           vRect;

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    if ( g_isPainting <= 0 )
+    if (g_isPainting <= 0)

     {
     {

-        wxFAIL_MSG( _T("wxPaintDC may be created only in EVT_PAINT handler!") );
-
+        wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") );

         return;
     }
 #endif // __WXDEBUG__
 
         return;
     }
 #endif // __WXDEBUG__
 

-    m_canvas = canvas;
+    m_pCanvas = pCanvas;

 
 

-    // do we have a DC for this window in the cache?
-    wxPaintDCInfo *info = FindInCache();
-    if ( info )
+    //
+    // Do we have a DC for this window in the cache?
+    //
+    wxPaintDCInfo*                  pInfo = FindInCache();
+
+    if (pInfo)

     {
     {

-        m_hDC = info->hdc;
-        info->count++;
+        m_hDC = pInfo->m_hDC;
+        pInfo->m_nCount++;

     }
     else // not in cache, create a new one
     {
     }
     else // not in cache, create a new one
     {

-        m_hDC = (WXHDC)::BeginPaint(GetWinHwnd(m_canvas), &g_paintStruct);
-        ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
-    }
+        HPS                         hPS;

 
 

-    // the background mode is only used for text background
-    // and is set in DrawText() to OPAQUE as required, other-
-    // wise always TRANSPARENT, RR
-    ::SetBkMode( GetHdc(), TRANSPARENT );
+        hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
+                              ,NULLHANDLE
+                              ,&g_paintStruct
+                             );
+        if(hPS)
+        {
+            POINTL                          vPoint[2];
+            LONG                            lControl;
+            LONG                            lColor;
+
+            m_hOldPS = m_hPS;
+            m_hPS = hPS;
+            ::GpiCreateLogColorTable( m_hPS
+                                     ,0L
+                                     ,LCOLF_CONSECRGB
+                                     ,0L
+                                     ,(LONG)wxTheColourDatabase->m_nSize
+                                     ,(PLONG)wxTheColourDatabase->m_palTable
+                                    );
+            ::GpiCreateLogColorTable( m_hPS
+                                     ,0L
+                                     ,LCOLF_RGB
+                                     ,0L
+                                     ,0L
+                                     ,NULL
+                                    );
+
+            ::WinFillRect(hPS, &g_paintStruct,  m_pCanvas->GetBackgroundColour().GetPixel());
+            ::WinQueryWindowRect( GetWinHwnd(m_pCanvas)
+                                 ,&m_vRclPaint
+                                );
+        }

 
 

-    SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
+        m_bIsPaintTime   = TRUE;
+        m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts
+        ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
+    }
+    SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));

 }
 
 wxPaintDC::~wxPaintDC()
 }
 
 wxPaintDC::~wxPaintDC()


@@ -223,16 +318,17 @@ wxPaintDC::~wxPaintDC()
     {
         SelectOldObjects(m_hDC);
 
     {
         SelectOldObjects(m_hDC);
 

-        size_t index;
-        wxPaintDCInfo *info = FindInCache(&index);
+        size_t                      nIndex;
+        wxPaintDCInfo*              pInfo = FindInCache(&nIndex);

 
 

-        wxCHECK_RET( info, _T("existing DC should have a cache entry") );
+        wxCHECK_RET( pInfo, wxT("existing DC should have a cache entry") );

 
 

-        if ( !--info->count )
+        if ( !--pInfo->m_nCount )

         {
         {

-            ::EndPaint(GetWinHwnd(m_canvas), &g_paintStruct);
-
-            ms_cache.Remove(index);
+            ::WinEndPaint(m_hPS);
+            m_hPS          = m_hOldPS;
+            m_bIsPaintTime = FALSE;
+            ms_cache.Remove(nIndex);

         }
         //else: cached DC entry is still in use
 
         }
         //else: cached DC entry is still in use
 


@@ -241,20 +337,23 @@ wxPaintDC::~wxPaintDC()
     }
 }
 
     }
 }
 

-wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
+wxPaintDCInfo* wxPaintDC::FindInCache(
+  size_t*                           pIndex
+) const

 {
 {

-    wxPaintDCInfo *info = NULL;
-    size_t nCache = ms_cache.GetCount();
-    for ( size_t n = 0; n < nCache; n++ )
+    wxPaintDCInfo*                  pInfo = NULL;
+    size_t                          nCache = ms_cache.GetCount();
+
+    for (size_t n = 0; n < nCache; n++)

     {
     {

-        info = &ms_cache[n];
-        if ( info->hwnd == m_canvas->GetHWND() )
+        pInfo = &ms_cache[n];
+        if (pInfo->m_hWnd == m_pCanvas->GetHWND())

         {
         {

-            if ( index )
-                *index = n;
+            if (pIndex)
+                *pIndex = n;

             break;
         }
     }
             break;
         }
     }

+    return pInfo;
+} // end of wxPaintDC::FindInCache

 
 

-    return info;
-}