Update the text part of combobox when changing text of selected item in wxGTK.

[wxWidgets.git] / src / generic / graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 215968306f52cb18203fc63f491be8b0d4f7b811..4dae80da49bcc23280ba7be70a4666733c930501 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -291,8 +291,7 @@ public:
 
     virtual bool Apply( wxGraphicsContext* context );
 #ifdef __WXGTK__
-    const PangoFontDescription* GetFont() const { return m_font; }
-    bool GetUnderlined() const { return m_underlined; }
+    const wxFont& GetFont() const { return m_wxfont; }
 #endif
 private :
     void InitColour(const wxColour& col);
@@ -308,8 +307,7 @@ private :
 #ifdef __WXMAC__
     cairo_font_face_t *m_font;
 #elif defined(__WXGTK__)
-    PangoFontDescription* m_font;
-    bool m_underlined;
+    wxFont m_wxfont;
 #endif
 
     // These members are used when the font is created from its face name and
@@ -845,7 +843,11 @@ wxCairoFontData::InitFontComponents(const wxString& facename,
 }
 
 wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font,
-                         const wxColour& col ) : wxGraphicsObjectRefData(renderer)
+                         const wxColour& col )
+    : wxGraphicsObjectRefData(renderer)
+#ifdef __WXGTK__
+    , m_wxfont(font)
+#endif
 {
     InitColour(col);
 
@@ -854,8 +856,6 @@ wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &fo
 #ifdef __WXMAC__
     m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() );
 #elif defined(__WXGTK__)
-    m_font = pango_font_description_copy( font.GetNativeFontInfo()->description );
-    m_underlined = font.GetUnderlined();
 #else
     InitFontComponents
     (
@@ -882,7 +882,7 @@ wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer,
     // directly to cairo_set_font_size().
     m_size = sizeInPixels;
 
-#if defined(__WXGTK__) || defined(__WXMAC__)
+#if defined(__WXMAC__)
     m_font = NULL;
 #endif
 
@@ -904,10 +904,6 @@ wxCairoFontData::~wxCairoFontData()
 #ifdef __WXMAC__
     if ( m_font )
         cairo_font_face_destroy( m_font );
-#elif defined(__WXGTK__)
-    if ( m_font )
-        pango_font_description_free( m_font );
-#else
 #endif
 }
 
@@ -916,7 +912,7 @@ bool wxCairoFontData::Apply( wxGraphicsContext* context )
     cairo_t * ctext = (cairo_t*) context->GetNativeContext();
     cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
 #ifdef __WXGTK__
-    if ( m_font )
+    if (m_wxfont.IsOk())
     {
         // Nothing to do, the caller uses Pango layout functions to do
         // everything.
@@ -1267,7 +1263,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
     // Create a surface object and copy the bitmap pixel data to it.  if the
     // image has alpha (or a mask represented as alpha) then we'll use a
     // different format and iterator than if it doesn't...
-    const cairo_format_t bufferFormat = bmp.GetDepth() == 32
+    cairo_format_t bufferFormat = bmp.GetDepth() == 32
 #ifdef __WXGTK__
                                             || bmp.GetMask()
 #endif
@@ -1558,22 +1554,6 @@ wxCairoBitmapData::~wxCairoBitmapData()
     delete [] m_buffer;
 }
 
-// ----------------------------------------------------------------------------
-// wxGraphicsBitmap implementation
-// ----------------------------------------------------------------------------
-
-#if wxUSE_IMAGE
-
-wxImage wxGraphicsBitmap::ConvertToImage() const
-{
-    const wxCairoBitmapData* const
-        data = static_cast<wxCairoBitmapData*>(GetGraphicsData());
-
-    return data ? data->ConvertToImage() : wxNullImage;
-}
-
-#endif // wxUSE_IMAGE
-
 //-----------------------------------------------------------------------------
 // wxCairoContext implementation
 //-----------------------------------------------------------------------------
@@ -1993,21 +1973,11 @@ void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y)
     if ( ((wxCairoFontData*)m_font.GetRefData())->Apply(this) )
     {
 #ifdef __WXGTK__
-        size_t datalen = strlen(data);
-
         PangoLayout *layout = pango_cairo_create_layout (m_context);
-        wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData();
-        pango_layout_set_font_description( layout, font_data->GetFont());
-        pango_layout_set_text(layout, data, datalen);
-
-        if (font_data->GetUnderlined())
-        {
-            PangoAttrList *attrs = pango_attr_list_new();
-            PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-            pango_attr_list_insert(attrs, attr);
-            pango_layout_set_attributes(layout, attrs);
-            pango_attr_list_unref(attrs);
-        }
+        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
+        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
+        pango_layout_set_text(layout, data, data.length());
+        font.GTKSetPangoAttrs(layout);
 
         cairo_move_to(m_context, x, y);
         pango_cairo_show_layout (m_context, layout);
@@ -2051,13 +2021,14 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
         int w, h;
 
         PangoLayout *layout = pango_cairo_create_layout (m_context);
-        pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
+        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
+        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
         const wxCharBuffer data = str.utf8_str();
         if ( !data )
         {
             return;
         }
-        pango_layout_set_text( layout, data, strlen(data) );
+        pango_layout_set_text(layout, data, data.length());
         pango_layout_get_pixel_size (layout, &w, &h);
         if ( width )
             *width = w;
@@ -2292,6 +2263,7 @@ public :
     virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
 #if wxUSE_IMAGE
     virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
+    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
 #endif // wxUSE_IMAGE
 
     // create a graphics bitmap from a native bitmap
@@ -2361,14 +2333,7 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
 {
     ENSURE_LOADED_OR_RETURN(NULL);
-#ifdef __WXGTK20__
-    const wxDCImpl *impl = dc.GetImpl();
-    cairo_t* context = (cairo_t*) impl->GetCairoContext();
-    if (context)
-       return new wxCairoContext(this,dc);
-    else
-#endif
-       return new wxCairoContext(this,dc);
+    return new wxCairoContext(this, dc);
 }
 
 #ifdef __WXMSW__
@@ -2558,8 +2523,19 @@ wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromImage(const wxImage& image)
     return bmp;
 }
 
+wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
+{
+    ENSURE_LOADED_OR_RETURN(wxNullImage);
+
+    const wxCairoBitmapData* const
+        data = static_cast<wxCairoBitmapData*>(bmp.GetGraphicsData());
+
+    return data ? data->ConvertToImage() : wxNullImage;
+}
+
 #endif // wxUSE_IMAGE
 
+
 wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap )
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);