projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation fix for wxUSE_PROTOCOL && !wxUSE_URL.
[wxWidgets.git]
/
src
/
gtk1
/
dcmemory.cpp
diff --git
a/src/gtk1/dcmemory.cpp
b/src/gtk1/dcmemory.cpp
index 713e58e881250c040554ceba76b4e564997cc207..18bc2d09755a39ffd8643e835ad21fb22dcc884d 100644
(file)
--- a/
src/gtk1/dcmemory.cpp
+++ b/
src/gtk1/dcmemory.cpp
@@
-10,40
+10,38
@@
// 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
+// wxMemoryDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxMemoryDC,wxWindowDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl
)
-
wxMemoryDC::wxMemoryDC() : wxWindowDC
()
+
void wxMemoryDCImpl::Init
()
{
m_ok = false;
m_cmap = gtk_widget_get_default_colormap();
}
{
m_ok = false;
m_cmap = gtk_widget_get_default_colormap();
}
-wxMemoryDC
::wxMemoryDC( wxDC *WXUNUSED(dc)
)
-
: wxWindowDC(
)
+wxMemoryDC
Impl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc)
)
+
: wxWindowDCImpl(owner
)
{
{
- m_ok = false;
-
- m_cmap = gtk_widget_get_default_colormap();
-
+ Init();
}
}
-wxMemoryDC
::~wxMemoryDC
()
+wxMemoryDC
Impl::~wxMemoryDCImpl
()
{
}
{
}
-void wxMemoryDC
::SelectObj
ect( const wxBitmap& bitmap )
+void wxMemoryDC
Impl::DoSel
ect( const wxBitmap& bitmap )
{
Destroy();
{
Destroy();
+
m_selected = bitmap;
if (m_selected.Ok())
{
m_selected = bitmap;
if (m_selected.Ok())
{
@@
-63,11
+61,11
@@
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
else
{
m_ok = false;
else
{
m_ok = false;
- m_window =
(GdkWindow *)
NULL;
+ m_window = NULL;
}
}
}
}
-void wxMemoryDC::SetPen( const wxPen& penOrig )
+void wxMemoryDC
Impl
::SetPen( const wxPen& penOrig )
{
wxPen pen( penOrig );
if ( m_selected.Ok() &&
{
wxPen pen( penOrig );
if ( m_selected.Ok() &&
@@
-77,10
+75,10
@@
void wxMemoryDC::SetPen( const wxPen& penOrig )
pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
}
pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
}
- wxWindowDC::SetPen( pen );
+ wxWindowDC
Impl
::SetPen( pen );
}
}
-void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
+void wxMemoryDC
Impl
::SetBrush( const wxBrush& brushOrig )
{
wxBrush brush( brushOrig );
if ( m_selected.Ok() &&
{
wxBrush brush( brushOrig );
if ( m_selected.Ok() &&
@@
-90,10
+88,10
@@
void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
}
brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
}
- wxWindowDC::SetBrush( brush );
+ wxWindowDC
Impl
::SetBrush( brush );
}
}
-void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
+void wxMemoryDC
Impl
::SetBackground( const wxBrush& brushOrig )
{
wxBrush brush(brushOrig);
{
wxBrush brush(brushOrig);
@@
-104,34
+102,34
@@
void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
}
brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
}
- wxWindowDC::SetBackground( brush );
+ wxWindowDC
Impl
::SetBackground( brush );
}
}
-void wxMemoryDC::SetTextForeground( const wxColour& col )
+void wxMemoryDC
Impl
::SetTextForeground( const wxColour& col )
{
if ( m_selected.Ok() && m_selected.GetBitmap() )
{
{
if ( m_selected.Ok() && m_selected.GetBitmap() )
{
- wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+ wxWindowDC
Impl
::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
}
else
{
}
else
{
- wxWindowDC::SetTextForeground( col );
+ wxWindowDC
Impl
::SetTextForeground( col );
}
}
}
}
-void wxMemoryDC::SetTextBackground( const wxColour &col )
+void wxMemoryDC
Impl
::SetTextBackground( const wxColour &col )
{
if (m_selected.Ok() && m_selected.GetBitmap())
{
{
if (m_selected.Ok() && m_selected.GetBitmap())
{
- wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+ wxWindowDC
Impl
::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
}
else
{
}
else
{
- wxWindowDC::SetTextBackground( col );
+ wxWindowDC
Impl
::SetTextBackground( col );
}
}
}
}
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDC
Impl
::DoGetSize( int *width, int *height ) const
{
if (m_selected.Ok())
{
{
if (m_selected.Ok())
{