Added a check to make sure 'parent' is valid, otherwise a crash could occur

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

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index af77090fd1610087023c5fa8f7bcf3b95f79efaf..bc20d8ac52456654f89b0e713df4545d62f25e7d 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -34,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"
 


@@ -82,51 +84,68 @@ static RECT        g_paintStruct;
 
 wxWindowDC::wxWindowDC()
 {
 
 wxWindowDC::wxWindowDC()
 {

-  m_pCanvas = NULL;
-}
-
-wxWindowDC::wxWindowDC(wxWindow *the_canvas)
-{
-  m_pCanvas = the_canvas;
-  m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(the_canvas) );
-  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);
-  SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
+    m_pCanvas = NULL;

 }
 
 }
 

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

 {
 {

-  if (m_pCanvas && m_hDC)
-  {
-    SelectOldObjects(m_hDC);
+    ERRORID                         vError;
+    wxString                        sError;

 
 

+    m_pCanvas = pTheCanvas;
+    m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
+    m_nDCCount++;

     //
     //

-    // 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
+    // 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

     //
     //

-    if(m_hPS)
+     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
+                                 ))

     {
     {

-        ::GpiAssociate(m_hPS, NULLHANDLE);
-        ::GpiDestroyPS(m_hPS);
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Unable to set current color table. Error: %s\n", sError);

     }
     }

-    m_hPS = NULLHANDLE;
-    m_hDC = NULLHANDLE;
-  }
+    SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
+}

 
 

-  m_nDCCount--;
+wxWindowDC::~wxWindowDC()
+{
+    if (m_pCanvas && 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
+        // 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--;

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


@@ -135,25 +154,42 @@ wxWindowDC::~wxWindowDC()
 
 wxClientDC::wxClientDC()
 {
 
 wxClientDC::wxClientDC()
 {

-  m_pCanvas = NULL;
+    m_pCanvas = NULL;

 }
 
 }
 

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

 {
     SIZEL                           vSizl = { 0,0};
 {
     SIZEL                           vSizl = { 0,0};

+    ERRORID                         vError;
+    wxString                        sError;

 
 

-    m_pCanvas = the_canvas;
+    m_pCanvas = pTheCanvas;

 
     //
     // default under PM is that Window and Client DC's are the same
     //
 
     //
     // default under PM is that Window and Client DC's are the same
     //

-    m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(the_canvas));
+    m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas));

     m_hPS = ::GpiCreatePS( wxGetInstance()
                           ,m_hDC
                           ,&vSizl
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 
     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
     //
     //
     // Default mode is BM_LEAVEALONE so we make no call Set the mix
     //


@@ -161,20 +197,21 @@ wxClientDC::wxClientDC(wxWindow *the_canvas)
                           ,wxSOLID
                          )
                  );
                           ,wxSOLID
                          )
                  );

-}
+} // end of wxClientDC::wxClientDC

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

-  if ( m_pCanvas && GetHdc() )
-  {
-    SelectOldObjects(m_hDC);
-
-    // We don't explicitly release Device contexts in PM and
-    // the cached micro PS is already gone
+    if ( m_pCanvas && GetHdc() )
+    {
+        SelectOldObjects(m_hDC);

 
 

-    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


@@ -209,6 +246,7 @@ wxPaintDC::wxPaintDC(
 )
 {
     wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor"));
 )
 {
     wxCHECK_RET(pCanvas, wxT("NULL canvas in wxPaintDC ctor"));

+    RECTL                           vRect;

 
 #ifdef __WXDEBUG__
     if (g_isPainting <= 0)
 
 #ifdef __WXDEBUG__
     if (g_isPainting <= 0)


@@ -227,8 +265,8 @@ wxPaintDC::wxPaintDC(
 
     if (pInfo)
     {
 
     if (pInfo)
     {

-        m_hDC = pInfo->hdc;
-        pInfo->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
     {


@@ -240,12 +278,35 @@ wxPaintDC::wxPaintDC(
                              );
         if(hPS)
         {
                              );
         if(hPS)
         {

+            POINTL                          vPoint[2];
+            LONG                            lControl;
+            LONG                            lColor;
+

             m_hOldPS = m_hPS;
             m_hPS = hPS;
             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
+                                );

         }
         }

+

         m_bIsPaintTime   = TRUE;
         m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts
         m_bIsPaintTime   = TRUE;
         m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts

-        m_vRclPaint = g_paintStruct;

         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));


@@ -257,17 +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, wxT("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 )

         {
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;
             m_bIsPaintTime = FALSE;
         {
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;
             m_bIsPaintTime = FALSE;

-            ms_cache.Remove(index);
+            ms_cache.Remove(nIndex);

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


@@ -276,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_pCanvas->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;
-}