Removed code duplication introduced during wxUniv merge in 1.132

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 748fe83850e88f6db51901b0f21ec5b8d7fcfc22..0bfd4b112fa3e9284c8e3a64c67665071c554559 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dcclient.h"
 #endif
 
@@ -293,11 +293,10 @@ wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
 // find the entry for this DC in the cache (keyed by the window)
 WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
 {
-    wxPaintDCInfo *info = NULL;
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
     {
-        info = &ms_cache[n];
+        wxPaintDCInfo *info = &ms_cache[n];
         if ( info->hwnd == win->GetHWND() )
         {
             return info->hdc;
@@ -310,15 +309,11 @@ WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
  * wxPaintDCEx
  */
  
+// TODO: don't duplicate wxPaintDC code here!!
+
 wxPaintDCEx::wxPaintDCEx(wxWindow *canvas, WXHDC dc) : saveState(0)
 {
-#ifdef __WXDEBUG__
-    if ( !dc )
-    {
-        wxFAIL_MSG( wxT("wxPaintDCEx requires an existing device context") );
-        return;
-    }
-#endif // __WXDEBUG__
+    wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
 
     m_canvas = canvas;