projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No changes, just reuse a bit of code in wxMSW wxMDIParentFrame.
[wxWidgets.git]
/
src
/
gtk
/
dcmemory.cpp
diff --git
a/src/gtk/dcmemory.cpp
b/src/gtk/dcmemory.cpp
index 3c22ca1fc19b2e57293b8c105de6fdb9576d6c2a..1933d5000b24f5d7e27a26982c5622d2a7906d06 100644
(file)
--- a/
src/gtk/dcmemory.cpp
+++ b/
src/gtk/dcmemory.cpp
@@
-10,10
+10,8
@@
// 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/gtk/dcmemory.h"
#include "wx/gtk/dcmemory.h"
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
@@
-22,17
+20,17
@@
IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
: wxWindowDCImpl( owner )
: wxWindowDCImpl( owner )
-{
- Init();
+{
+ Init();
}
}
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap)
: wxWindowDCImpl( owner )
: wxWindowDCImpl( owner )
-{
- Init();
- DoSelect(bitmap);
+{
+ Init();
+ DoSelect(bitmap);
}
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
}
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
@@
-65,7
+63,7
@@
void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
Destroy();
m_selected = bitmap;
Destroy();
m_selected = bitmap;
- if (m_selected.Ok())
+ if (m_selected.
Is
Ok())
{
m_gdkwindow = m_selected.GetPixmap();
{
m_gdkwindow = m_selected.GetPixmap();
@@
-76,14
+74,14
@@
void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
else
{
m_ok = false;
else
{
m_ok = false;
- m_gdkwindow =
(GdkWindow *)
NULL;
+ m_gdkwindow = NULL;
}
}
void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
{
wxPen pen( penOrig );
}
}
void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
{
wxPen pen( penOrig );
- if ( m_selected.Ok() &&
+ if ( m_selected.
Is
Ok() &&
m_selected.GetDepth() == 1 &&
(pen != *wxTRANSPARENT_PEN) )
{
m_selected.GetDepth() == 1 &&
(pen != *wxTRANSPARENT_PEN) )
{
@@
-96,7
+94,7
@@
void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
{
wxBrush brush( brushOrig );
void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
{
wxBrush brush( brushOrig );
- if ( m_selected.Ok() &&
+ if ( m_selected.
Is
Ok() &&
m_selected.GetDepth() == 1 &&
(brush != *wxTRANSPARENT_BRUSH) )
{
m_selected.GetDepth() == 1 &&
(brush != *wxTRANSPARENT_BRUSH) )
{
@@
-110,7
+108,7
@@
void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
{
wxBrush brush(brushOrig);
{
wxBrush brush(brushOrig);
- if ( m_selected.Ok() &&
+ if ( m_selected.
Is
Ok() &&
m_selected.GetDepth() == 1 &&
(brush != *wxTRANSPARENT_BRUSH) )
{
m_selected.GetDepth() == 1 &&
(brush != *wxTRANSPARENT_BRUSH) )
{
@@
-122,7
+120,7
@@
void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
{
void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
{
- if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
+ if ( m_selected.
Is
Ok() && m_selected.GetDepth() == 1 )
wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
else
wxWindowDCImpl::SetTextForeground( col );
wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
else
wxWindowDCImpl::SetTextForeground( col );
@@
-130,7
+128,7
@@
void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
{
void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
{
- if (m_selected.Ok() && m_selected.GetDepth() == 1)
+ if (m_selected.
Is
Ok() && m_selected.GetDepth() == 1)
wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
else
wxWindowDCImpl::SetTextBackground( col );
wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
else
wxWindowDCImpl::SetTextBackground( col );
@@
-138,7
+136,7
@@
void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
{
void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
{
- if (m_selected.Ok())
+ if (m_selected.
Is
Ok())
{
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,3
+164,8
@@
wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
return m_selected;
}
return m_selected;
}
+void* wxMemoryDCImpl::GetHandle() const
+{
+ const wxBitmap& bmp = GetSelectedBitmap();
+ return bmp.GetPixmap();
+}