compilation fix

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index f01f370d2e15bbf044f4fbf12e1cc5ee979be884..562143fe57c8bde2b48fada5bd860bcf7b7636ad 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -19,6 +19,8 @@
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"

+#include "wx/log.h"
+#include "wx/fontutil.h"

 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 


@@ -169,25 +171,56 @@ struct wxGC
     bool          m_used;
 };
 
     bool          m_used;
 };
 

-static wxGC wxGCPool[GC_POOL_SIZE];
+#define GC_POOL_ALLOC_SIZE 100
+
+static int wxGCPoolSize = 0;
+
+static wxGC *wxGCPool = NULL;

 
 static void wxInitGCPool()
 {
 
 static void wxInitGCPool()
 {

-    memset( wxGCPool, 0, GC_POOL_SIZE*sizeof(wxGC) );
+    // This really could wait until the first call to
+    // wxGetPoolGC, but we will make the first allocation
+    // now when other initialization is being performed.
+    
+    // Set initial pool size.
+    wxGCPoolSize = GC_POOL_ALLOC_SIZE;
+    
+    // Allocate initial pool.
+    wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC));
+    if (wxGCPool == NULL)
+    {
+        // If we cannot malloc, then fail with error
+        // when debug is enabled.  If debug is not enabled,
+        // the problem will eventually get caught
+               // in wxGetPoolGC.
+        wxFAIL_MSG( wxT("Cannot allocate GC pool") );
+        return;
+    }
+    
+    // Zero initial pool.
+    memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));

 }
 
 static void wxCleanUpGCPool()
 {
 }
 
 static void wxCleanUpGCPool()
 {

-    for (int i = 0; i < GC_POOL_SIZE; i++)
+    for (int i = 0; i < wxGCPoolSize; i++)

     {
         if (wxGCPool[i].m_gc)
             gdk_gc_unref( wxGCPool[i].m_gc );
     }
     {
         if (wxGCPool[i].m_gc)
             gdk_gc_unref( wxGCPool[i].m_gc );
     }

+
+    free(wxGCPool);
+    wxGCPool = NULL;
+    wxGCPoolSize = 0;

 }
 
 static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
 {
 }
 
 static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
 {

-    for (int i = 0; i < GC_POOL_SIZE; i++)
+    wxGC *pptr;
+    
+    // Look for an available GC.
+    for (int i = 0; i < wxGCPoolSize; i++)

     {
         if (!wxGCPool[i].m_gc)
         {
     {
         if (!wxGCPool[i].m_gc)
         {


@@ -203,6 +236,31 @@ static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
         }
     }
 
         }
     }
 

+    // We did not find an available GC.
+    // We need to grow the GC pool.
+    pptr = (wxGC *)realloc(wxGCPool,
+               (wxGCPoolSize + GC_POOL_ALLOC_SIZE)*sizeof(wxGC));
+    if (pptr != NULL)
+    {
+        // Initialize newly allocated pool.
+        wxGCPool = pptr;
+       memset(&wxGCPool[wxGCPoolSize], 0,
+                       GC_POOL_ALLOC_SIZE*sizeof(wxGC));
+    
+        // Initialize entry we will return.    
+        wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window );
+        gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE );
+        wxGCPool[wxGCPoolSize].m_type = type;
+        wxGCPool[wxGCPoolSize].m_used = TRUE;
+        
+        // Set new value of pool size.
+        wxGCPoolSize += GC_POOL_ALLOC_SIZE;
+        
+        // Return newly allocated entry.
+        return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc;
+    }
+    
+    // The realloc failed.  Fall through to error.

     wxFAIL_MSG( wxT("No GC available") );
 
     return (GdkGC*) NULL;
     wxFAIL_MSG( wxT("No GC available") );
 
     return (GdkGC*) NULL;


@@ -210,7 +268,7 @@ static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
 
 static void wxFreePoolGC( GdkGC *gc )
 {
 
 static void wxFreePoolGC( GdkGC *gc )
 {

-    for (int i = 0; i < GC_POOL_SIZE; i++)
+    for (int i = 0; i < wxGCPoolSize; i++)

     {
         if (wxGCPool[i].m_gc == gc)
         {
     {
         if (wxGCPool[i].m_gc == gc)
         {


@@ -246,6 +304,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 +316,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


@@ -273,6 +331,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );
 
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );

+    

     m_fontdesc = widget->style->font_desc;
 #endif
 
     m_fontdesc = widget->style->font_desc;
 #endif
 


@@ -400,10 +459,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
     m_owner->GetSize(width, height);
 }
 

-void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                           const wxColour &WXUNUSED(col), int WXUNUSED(style) )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
+
+bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, int style)

 {
 {

-    wxFAIL_MSG( wxT("wxWindowDC::DoFloodFill not implemented") );
+    return wxDoFloodFill(this, x, y, col, style);

 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const


@@ -416,7 +478,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
     memdc.SelectObject(wxNullBitmap);
 
     memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
     memdc.SelectObject(wxNullBitmap);
 

-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();

     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return TRUE;
 }
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return TRUE;
 }


@@ -999,18 +1061,18 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     wxBitmap use_bitmap;
     if ((w != ww) || (h != hh))
     {
     wxBitmap use_bitmap;
     if ((w != ww) || (h != hh))
     {

-        wxImage image( bitmap );
+        wxImage image = bitmap.ConvertToImage();

         image.Rescale( ww, hh );
         if (is_mono)
         image.Rescale( ww, hh );
         if (is_mono)

-            use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+            use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);

         else
         else

-            use_bitmap = image.ConvertToBitmap();
+            use_bitmap = wxBitmap(image);

     }
     else
     {
         use_bitmap = bitmap;
     }
     }
     else
     {
         use_bitmap = bitmap;
     }

-
+    

     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();


@@ -1018,6 +1080,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;

+#ifndef __WXGTK20__  // TODO fix crash

             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;
             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;


@@ -1037,7 +1100,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
                 gdk_gc_unref( gc );
             }
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
                 gdk_gc_unref( gc );
             }

-
+#endif

             if (is_mono)
             {
                 if (new_mask)
             if (is_mono)
             {
                 if (new_mask)


@@ -1054,6 +1117,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
                     gdk_gc_set_clip_mask( m_penGC, mask );
                 gdk_gc_set_clip_origin( m_penGC, xx, yy );
             }
                     gdk_gc_set_clip_mask( m_penGC, mask );
                 gdk_gc_set_clip_origin( m_penGC, xx, yy );
             }

+            

             if (new_mask)
                 gdk_bitmap_unref( new_mask );
         }
             if (new_mask)
                 gdk_bitmap_unref( new_mask );
         }


@@ -1104,10 +1168,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;


@@ -1199,13 +1263,13 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
 
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {

-            wxImage image( memDC->m_selected );
+            wxImage image = memDC->m_selected.ConvertToImage();

             image = image.Scale( bm_ww, bm_hh );
 
             if (is_mono)
             image = image.Scale( bm_ww, bm_hh );
 
             if (is_mono)

-                use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+                use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);

             else
             else

-                use_bitmap = image.ConvertToBitmap();
+                use_bitmap = wxBitmap(image);

         }
         else
         {
         }
         else
         {


@@ -1219,6 +1283,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;

+#ifndef __WXGTK20__  // TODO fix crash

             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;
             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;


@@ -1238,7 +1303,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 gdk_gc_unref( gc );
             }
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 gdk_gc_unref( gc );
             }

-
+#endif

             if (is_mono)
             {
                 if (new_mask)
             if (is_mono)
             {
                 if (new_mask)


@@ -1313,11 +1378,11 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
 
             /* scale image */
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
 
             /* scale image */

-            wxImage image( bitmap );
+            wxImage image = bitmap.ConvertToImage();

             image = image.Scale( ww, hh );
 
             /* convert to bitmap */
             image = image.Scale( ww, hh );
 
             /* convert to bitmap */

-            bitmap = image.ConvertToBitmap();
+            bitmap = wxBitmap(image);

 
             /* draw scaled bitmap */
             gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
 
             /* draw scaled bitmap */
             gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );


@@ -1358,12 +1423,12 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     y = YLOG2DEV(y);
 
 #if defined(__WXGTK20__) && wxUSE_WCHAR_T
     y = YLOG2DEV(y);
 
 #if defined(__WXGTK20__) && wxUSE_WCHAR_T

-    /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
+    // TODO: the layout engine should be abstracted at a higher level!

     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);
     {
     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);
     {

-        wxWX2MBbuf data = text.mb_str(wxConvUTF8);
-        pango_layout_set_text(layout, data, strlen(data));
+        const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
+        pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));

     }
     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
     PangoRectangle rect;
     }
     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
     PangoRectangle rect;


@@ -1371,7 +1436,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     wxCoord width = rect.width;
     wxCoord height = rect.height;
     gdk_draw_layout( m_window, m_textGC, x, y, layout );
     wxCoord width = rect.width;
     wxCoord height = rect.height;
     gdk_draw_layout( m_window, m_textGC, x, y, layout );

-#else
+#else // GTK+ 1.x

     wxCoord width = gdk_string_width( font, text.mbc_str() );
     wxCoord height = font->ascent + font->descent;
 
     wxCoord width = gdk_string_width( font, text.mbc_str() );
     wxCoord height = font->ascent + font->descent;
 


@@ -1382,7 +1447,6 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
     }
     gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
         gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
     }
     gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );

-#endif

 
     /* CMB 17/7/98: simple underline: ignores scaling and underlying
        X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
 
     /* CMB 17/7/98: simple underline: ignores scaling and underlying
        X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS


@@ -1393,6 +1457,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         if (font->descent > 0) ul_y++;
         gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
     }
         if (font->descent > 0) ul_y++;
         gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
     }

+#endif // GTK+ 2.0/1.x

 
 #if defined(__WXGTK20__) && wxUSE_WCHAR_T
     g_object_unref( G_OBJECT( layout ) );
 
 #if defined(__WXGTK20__) && wxUSE_WCHAR_T
     g_object_unref( G_OBJECT( layout ) );


@@ -1433,7 +1498,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.


@@ -1457,7 +1521,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 
     // prepare to blit-with-rotate the bitmap to the DC
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 
     // prepare to blit-with-rotate the bitmap to the DC

-    wxImage image(src);
+    wxImage image = src.ConvertToImage();

 
     GdkColor *colText = m_textForegroundColour.GetColor(),
              *colBack = m_textBackgroundColour.GetColor();
 
     GdkColor *colText = m_textForegroundColour.GetColor(),
              *colBack = m_textBackgroundColour.GetColor();


@@ -1493,7 +1557,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
                 // don't use DrawPoint() because it uses the current pen
                 // colour, and we don't need it here
                 gdk_draw_point( m_window, m_textGC,
                 // don't use DrawPoint() because it uses the current pen
                 // colour, and we don't need it here
                 gdk_draw_point( m_window, m_textGC,

-                                XLOG2DEV(x + dstX), YLOG2DEV(y + dstY) );
+                                XLOG2DEV(x) + dstX, YLOG2DEV(y) + dstY );

             }
         }
     }
             }
         }
     }


@@ -1524,12 +1588,44 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
 {
     wxFont fontToUse = m_font;
     if (theFont) fontToUse = *theFont;
 {
     wxFont fontToUse = m_font;
     if (theFont) fontToUse = *theFont;

-
+    if (string.IsEmpty())
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+        return;
+    }
+    
+#ifdef __WXGTK20__
+    PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
+    PangoLayout *layout = pango_layout_new(m_context);
+    pango_layout_set_font_description(layout, desc);
+    {
+        const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
+        pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+    }
+    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+ 
+    PangoRectangle rect;
+    pango_layout_line_get_extents(line, NULL, &rect);
+       
+    
+    if (width) (*width) = (wxCoord) (rect.width / PANGO_SCALE);
+    if (height) (*height) = (wxCoord) (rect.height / PANGO_SCALE);
+    if (descent)
+    {
+        // Do something about metrics here
+        (*descent) = 0;
+    }
+    if (externalLeading) (*externalLeading) = 0;  // ??
+    
+    g_object_unref( G_OBJECT( layout ) );
+#else

     GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
     if (width) (*width) = wxCoord(gdk_string_width( font, string.mbc_str() ) / m_scaleX);
     if (height) (*height) = wxCoord((font->ascent + font->descent) / m_scaleY);
     if (descent) (*descent) = wxCoord(font->descent / m_scaleY);
     if (externalLeading) (*externalLeading) = 0;  // ??
     GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
     if (width) (*width) = wxCoord(gdk_string_width( font, string.mbc_str() ) / m_scaleX);
     if (height) (*height) = wxCoord((font->ascent + font->descent) / m_scaleY);
     if (descent) (*descent) = wxCoord(font->descent / m_scaleY);
     if (externalLeading) (*externalLeading) = 0;  // ??

+#endif

 }
 
 wxCoord wxWindowDC::GetCharWidth() const
 }
 
 wxCoord wxWindowDC::GetCharWidth() const


@@ -1554,6 +1650,11 @@ void wxWindowDC::Clear()
 
     if (!m_window) return;
 
 
     if (!m_window) return;
 

+    // VZ: the code below results in infinite recursion and crashes when
+    //     dc.Clear() is done from OnPaint() so I disable it for now.
+    //     I don't know what the correct fix is but Clear() surely should not
+    //     reenter OnPaint()!
+#if 0

     /* - we either are a memory dc or have a window as the
        owner. anything else shouldn't happen.
        - we don't use gdk_window_clear() as we don't set
     /* - we either are a memory dc or have a window as the
        owner. anything else shouldn't happen.
        - we don't use gdk_window_clear() as we don't set


@@ -1563,9 +1664,7 @@ void wxWindowDC::Clear()
 
     if (m_owner)
     {
 
     if (m_owner)
     {

-        int width,height;
-        m_owner->GetSize( &width, &height );
-        gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+        m_owner->Clear();

         return;
     }
 
         return;
     }
 


@@ -1576,13 +1675,22 @@ void wxWindowDC::Clear()
         gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
         return;
     }
         gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
         return;
     }

+#else // 1
+    int width,height;
+    GetSize( &width, &height );
+    gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+#endif // 0/1

 }
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
 }
 
 void wxWindowDC::SetFont( const wxFont &font )
 {

+    // It is common practice to set the font to wxNullFont, so
+    // don't consider it to be an error
+    //    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+

     m_font = font;
 #ifdef __WXGTK20__
     m_font = font;
 #ifdef __WXGTK20__

-    // fix fontdesc?
+    m_fontdesc = m_font.GetNativeFontInfo()->description;

 #endif
 }
 
 #endif
 }