added missing WXDLLEXPORT

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index f01f370d2e15bbf044f4fbf12e1cc5ee979be884..51f831c216ad88cb1d6ba91ee3b810f95ad776db 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -246,6 +246,8 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 {

+    wxASSERT_MSG( window, wxT("DC needs a window") );
+

     m_penGC = (GdkGC *) NULL;
     m_brushGC = (GdkGC *) NULL;
     m_textGC = (GdkGC *) NULL;
     m_penGC = (GdkGC *) NULL;
     m_brushGC = (GdkGC *) NULL;
     m_textGC = (GdkGC *) NULL;


@@ -256,8 +258,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_isScreenDC = FALSE;
     m_font = window->GetFont();
 
     m_isScreenDC = FALSE;
     m_font = window->GetFont();
 

-    wxASSERT_MSG( window, wxT("DC needs a window") );
-

     GtkWidget *widget = window->m_wxwindow;
 
     // some controls don't have m_wxwindow - like wxStaticBox, but the user
     GtkWidget *widget = window->m_wxwindow;
 
     // some controls don't have m_wxwindow - like wxStaticBox, but the user


@@ -1104,10 +1104,10 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
     if (!m_window) return FALSE;
 
 
     if (!m_window) return FALSE;
 

-#if 0
+#if 1

     // transform the source DC coords to the device ones
     // transform the source DC coords to the device ones

-    xsrc = XLOG2DEV(xsrc);
-    ysrc = YLOG2DEV(ysrc);
+    xsrc = source->XLOG2DEV(xsrc);
+    ysrc = source->YLOG2DEV(ysrc);

 #endif
 
     wxClientDC *srcDC = (wxClientDC*)source;
 #endif
 
     wxClientDC *srcDC = (wxClientDC*)source;


@@ -1433,7 +1433,6 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     dc.SetBrush(*wxBLACK_BRUSH);
     dc.Clear();
     dc.DrawText(text, 0, 0);
     dc.SetBrush(*wxBLACK_BRUSH);
     dc.Clear();
     dc.DrawText(text, 0, 0);

-    dc.SetFont(wxNullFont);

     dc.SelectObject(wxNullBitmap);
 
     // Calculate the size of the rotated bounding box.
     dc.SelectObject(wxNullBitmap);
 
     // Calculate the size of the rotated bounding box.


@@ -1580,6 +1579,8 @@ void wxWindowDC::Clear()
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
 
 void wxWindowDC::SetFont( const wxFont &font )
 {

+    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+

     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?
     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?