don't lose the contents of the combobox if it was set to a value not in a list and...

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 804ba3e3a382163af794e76ac6bfe92f81726ebd..3d865283d2d1af0feda66b0907ece00d1fe85bad 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -1,68 +1,144 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
+// 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>

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

-// wxMemoryDC
+// wxMemoryDCImpl

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

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

 
 

-wxMemoryDC::wxMemoryDC(void)
+void wxMemoryDCImpl::Init()

 {
 {

-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+    m_ok = false;
+
+    m_cmap = gtk_widget_get_default_colormap();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+              : wxWindowDCImpl(owner)
+{
+    Init();
+}
+
+wxMemoryDCImpl::~wxMemoryDCImpl()
+{
+}
+
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
+{
+    Destroy();
+
+    m_selected = bitmap;
+    if (m_selected.Ok())
+    {
+        if (m_selected.GetPixmap())
+        {
+            m_window = m_selected.GetPixmap();
+        }
+        else
+        {
+            m_window = m_selected.GetBitmap();
+        }

 
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+        m_isMemDC = true;
+
+        SetUpDC();
+    }
+    else
+    {
+        m_ok = false;
+        m_window = (GdkWindow *) NULL;
+    }
+}
+
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )

 {
 {

-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+    wxPen pen( penOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (pen != *wxTRANSPARENT_PEN) )
+    {
+        pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxWindowDCImpl::SetPen( pen );
+}

 
 

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

 {
 {

-};
+    wxBrush brush( brushOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }

 
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+    wxWindowDCImpl::SetBrush( brush );
+}
+
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )

 {
 {

-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-    m_window = m_selected.GetPixmap();
-    SetUpDC();
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_window = NULL;
-  };
-};
-
-void wxMemoryDC::GetSize( int *width, int *height )
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxWindowDCImpl::SetBackground( brush );
+}
+
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )

 {
 {

-  if (m_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  };
-};
+    if ( m_selected.Ok() && m_selected.GetBitmap() )
+    {
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }
+    else
+    {
+        wxWindowDCImpl::SetTextForeground( col );
+    }
+}

 
 

+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap())
+    {
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+    else
+    {
+        wxWindowDCImpl::SetTextBackground( col );
+    }
+}

 
 

+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
+{
+    if (m_selected.Ok())
+    {
+        if (width) (*width) = m_selected.GetWidth();
+        if (height) (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+    }
+}