add ka_GE, ku_TR and ne_NP; some cleanup and better handling of sr_XX (patch 1858926)

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index b57a4b8aa81223581bb44e9e2584020ff0197eea..3c22ca1fc19b2e57293b8c105de6fdb9576d6c2a 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -11,70 +11,76 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"

+#include "wx/gtk/dcmemory.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)

 
 

-wxMemoryDC::wxMemoryDC() : wxWindowDC()
-{
-    m_ok = false;
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+  : wxWindowDCImpl( owner )
+{ 
+    Init(); 
+}

 
 

-    m_cmap = gtk_widget_get_default_colormap();
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) 
+  : wxWindowDCImpl( owner )
+{ 
+    Init(); 
+    DoSelect(bitmap); 
+}

 
 

-    m_context = gdk_pango_context_get();
-    // Note: The Sun customised version of Pango shipping with Solaris 10
-    // crashes if the language is left NULL (see bug 1374114)
-    pango_context_set_language( m_context, gtk_get_default_language() );
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
+  : wxWindowDCImpl( owner )
+{
+    Init();
+}
+
+wxMemoryDCImpl::~wxMemoryDCImpl()
+{
+    g_object_unref(m_context);

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-  : wxWindowDC()
+void wxMemoryDCImpl::Init()

 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_context = gdk_pango_context_get();
 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_context = gdk_pango_context_get();

+    // Note: The Sun customised version of Pango shipping with Solaris 10
+    // crashes if the language is left NULL (see bug 1374114)

     pango_context_set_language( m_context, gtk_get_default_language() );
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
 }
 
     pango_context_set_language( m_context, gtk_get_default_language() );
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
 }
 

-wxMemoryDC::~wxMemoryDC()
-{
-    g_object_unref(m_context);
-}
-
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {

-        m_window = m_selected.GetPixmap();
+        m_gdkwindow = m_selected.GetPixmap();

 
         m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
 
 
         m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
 

-        m_isMemDC = true;
-
-        SetUpDC();
+        SetUpDC( true );

     }
     else
     {
         m_ok = false;
     }
     else
     {
         m_ok = false;

-        m_window = (GdkWindow *) NULL;
+        m_gdkwindow = (GdkWindow *) NULL;

     }
 }
 
     }
 }
 

-void wxMemoryDC::SetPen( const wxPen& penOrig )
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )

 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&
 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&


@@ -84,10 +90,10 @@ void wxMemoryDC::SetPen( const wxPen& penOrig )
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 

-    wxWindowDC::SetPen( pen );
+    wxWindowDCImpl::SetPen( pen );

 }
 
 }
 

-void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )

 {
     wxBrush brush( brushOrig );
     if ( m_selected.Ok() &&
 {
     wxBrush brush( brushOrig );
     if ( m_selected.Ok() &&


@@ -97,10 +103,10 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 

-    wxWindowDC::SetBrush( brush );
+    wxWindowDCImpl::SetBrush( brush );

 }
 
 }
 

-void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )

 {
     wxBrush brush(brushOrig);
 
 {
     wxBrush brush(brushOrig);
 


@@ -111,34 +117,26 @@ void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 

-    wxWindowDC::SetBackground( brush );
+    wxWindowDCImpl::SetBackground( brush );

 }
 
 }
 

-void wxMemoryDC::SetTextForeground( const wxColour& col )
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )

 {
     if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
 {
     if ( m_selected.Ok() && m_selected.GetDepth() == 1 )

-    {
-        wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
-    }
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);

     else
     else

-    {
-        wxWindowDC::SetTextForeground( col );
-    }
+        wxWindowDCImpl::SetTextForeground( col );

 }
 
 }
 

-void wxMemoryDC::SetTextBackground( const wxColour &col )
+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )

 {
     if (m_selected.Ok() && m_selected.GetDepth() == 1)
 {
     if (m_selected.Ok() && m_selected.GetDepth() == 1)

-    {
-        wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
-    }
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );

     else
     else

-    {
-        wxWindowDC::SetTextBackground( col );
-    }
+        wxWindowDCImpl::SetTextBackground( col );

 }
 
 }
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
     if (m_selected.Ok())
     {
 {
     if (m_selected.Ok())
     {


@@ -151,3 +149,20 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

+
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect *subrect) const
+{
+    wxBitmap bmp = GetSelectedBitmap();
+    return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
+}
+
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_selected;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_selected;
+}
+