Fixed wxRichTextCtrl base class

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 8ae3e61149df565126ec95016d0b4f0319fbb71c..b334b74c125da15d24cdecdb3c76c00375969fa3 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -271,18 +271,18 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *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

-    // code should still be able to create wxClientDCs for them, so we will
-    // use the parent window here then.
+    // code should still be able to create wxClientDCs for them

     if ( !widget )
     {
     if ( !widget )
     {

-        window = window->GetParent();
-        if (window)
-            widget = window->m_wxwindow;
-    }
+        widget = window->m_widget;
+
+        wxCHECK_RET(widget, "DC needs a widget");

 
 

-    wxASSERT_MSG( widget, wxT("DC needs a widget") );
+        if (GTK_WIDGET_NO_WINDOW(widget))
+            SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y);
+    }

 
 

-    m_context = window->GtkGetPangoDefaultContext();
+    m_context = window->GTKGetPangoDefaultContext();

     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 


@@ -297,7 +297,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
          return;
     }
 
          return;
     }
 

-    m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
+    m_cmap = gtk_widget_get_colormap(widget);

 
     SetUpDC();
 
 
     SetUpDC();
 


@@ -1813,7 +1813,7 @@ void wxWindowDCImpl::SetFont( const wxFont &font )
         {
             PangoContext *oldContext = m_context;
 
         {
             PangoContext *oldContext = m_context;
 

-            m_context = m_window->GtkGetPangoDefaultContext();
+            m_context = m_window->GTKGetPangoDefaultContext();

 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,
 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,