Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 5d945a329f12402f9cbe598be8c4473a75643c3a..90b866b03480c1c3b40f4aa249d58285a3c88e6c 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/gtk1/dcmemory.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -10,60 +10,40 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcmemory.h"
+#include "wx/gtk1/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()
+void wxMemoryDCImpl::Init()

 {
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_cmap = gtk_widget_get_default_colormap();

-
-#ifdef __WXGTK20__
-    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 ) );
-#endif

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-  : wxWindowDC()
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+              : wxWindowDCImpl(owner)

 {
 {

-    m_ok = FALSE;
-
-    m_cmap = gtk_widget_get_default_colormap();
-
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    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 ) );
-#endif
+    Init();

 }
 
 }
 

-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()

 {
 {

-#ifdef __WXGTK20__
-    g_object_unref(m_context);
-#endif

 }
 
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     m_selected = bitmap;

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (m_selected.GetPixmap())
         {
     {
         if (m_selected.GetPixmap())
         {


@@ -74,88 +54,84 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-#ifdef __WXGTK20__
-        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
-#endif
-
-        m_isMemDC = TRUE;
+        m_isMemDC = true;

 
         SetUpDC();
     }
     else
     {
 
         SetUpDC();
     }
     else
     {

-        m_ok = FALSE;
-        m_window = (GdkWindow *) NULL;
+        m_ok = false;
+        m_window = NULL;

     }
 }
 
     }
 }
 

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

 {
     wxPen pen( penOrig );
 {
     wxPen pen( penOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
             m_selected.GetBitmap() &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
         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 );
 {
     wxBrush brush( brushOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 
             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         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);
 

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         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.GetBitmap() )
+    if ( m_selected.IsOk() && m_selected.GetBitmap() )

     {
     {

-        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.GetBitmap())
+    if (m_selected.IsOk() && m_selected.GetBitmap())

     {
     {

-        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.IsOk())

     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();
     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();


@@ -166,5 +142,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

-
-