Restored wxSizeEvent code form last week -> wxGLCanvas

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 668155d07c008f2ddbd48a071c1d84a3cf2dec81..cdd1f139506fc6de7f7e60c60ee82b71c7b1a15d 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -14,6 +14,7 @@
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
+#include "wx/gtk/win_gtk.h"
 #include <math.h>               // for floating-point functions
 
 #include "gdk/gdk.h"
@@ -118,7 +119,8 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 
     wxASSERT_MSG( widget, wxT("DC needs a widget") );
 
-    m_window = widget->window;
+    GtkMyFixed *myfixed = GTK_MYFIXED( widget );
+    m_window = myfixed->bin_window;
 
     /* not realized ? */
     if (!m_window)
@@ -209,7 +211,7 @@ void wxWindowDC::DoDrawArc( long x1, long y1, long x2, long y2,
     long yyc = YLOG2DEV(yc);
     double dx = xx1 - xxc;
     double dy = yy1 - yyc;
-    double radius = sqrt(dx*dx+dy*dy);
+    double radius = sqrt((double)(dx*dx+dy*dy));
     long   r      = (long)radius;
     double radius1, radius2;
 
@@ -760,6 +762,8 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y )
 
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
+    wxCHECK_RET( font, wxT("invalid font") );
+
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);