unapplied part of Dimitri's patch at his request

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

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 440e8290b98ada724daf4d6f3360b909370fcdae..720398ea5dd5bad42cd11ecdb532a092f13cf192 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -113,6 +113,18 @@ void wxWindowDC::InitDC()
 
     // default bg colour is pne of the window
     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
 
     // default bg colour is pne of the window
     SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));

+
+    // since we are a window dc we need to grab the palette from the window
+#if wxUSE_PALETTE
+    InitializePalette();
+#endif
+}
+
+void wxWindowDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_canvas, _T("wxWindowDC without a window?") );
+
+    m_canvas->GetSize(width, height);

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


@@ -160,6 +172,13 @@ wxClientDC::~wxClientDC()
 {
 }
 
 {
 }
 

+void wxClientDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_canvas, _T("wxClientDC without a window?") );
+
+    m_canvas->GetClientSize(width, height);
+}
+

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


@@ -212,11 +231,14 @@ wxPaintDC::wxPaintDC(wxWindow *canvas)
     else // not in cache, create a new one
     {
         m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
     else // not in cache, create a new one
     {
         m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);

-        ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
+       if (m_hDC)
+            ms_cache.Add(new wxPaintDCInfo(m_canvas, this));

     }
 
     }
 

-    // (re)set the DC parameters
-    InitDC();
+    // (re)set the DC parameters.
+    // Note: at this point m_hDC can be NULL under MicroWindows, when dragging.
+    if (GetHDC())
+        InitDC();

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


@@ -234,7 +256,7 @@ wxPaintDC::~wxPaintDC()
         {
             ::EndPaint(GetHwndOf(m_canvas), &g_paintStruct);
 
         {
             ::EndPaint(GetHwndOf(m_canvas), &g_paintStruct);
 

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

 
             // Reduce the number of bogus reports of non-freed memory
             // at app exit
 
             // Reduce the number of bogus reports of non-freed memory
             // at app exit