wxWindowDC now uses its window's font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 649070a9158a46b50ce35c445021f50d671d6fd8..eadd93d70cf5d2d7fbaff768e1b5077f145c3ed8 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -110,6 +110,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;

+    m_font = window->GetFont();

   
     wxASSERT_MSG( window, _T("DC needs a window") );
     
   
     wxASSERT_MSG( window, _T("DC needs a window") );
     

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 649070a9158a46b50ce35c445021f50d671d6fd8..eadd93d70cf5d2d7fbaff768e1b5077f145c3ed8 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -110,6 +110,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;
     m_cmap = (GdkColormap *) NULL;
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;

+    m_font = window->GetFont();

   
     wxASSERT_MSG( window, _T("DC needs a window") );
     
   
     wxASSERT_MSG( window, _T("DC needs a window") );