projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement wxWindow::DoGetBorderSize() for all ports.
[wxWidgets.git]
/
src
/
motif
/
dcmemory.cpp
diff --git
a/src/motif/dcmemory.cpp
b/src/motif/dcmemory.cpp
index 546dc4417c09e98fac6c0afd9038833f0c31abcd..79b11e38e6b34ca7bc082f5ca5a08bb5dd18cc9b 100644
(file)
--- a/
src/motif/dcmemory.cpp
+++ b/
src/motif/dcmemory.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.cpp
-// Purpose: wxMemoryDC class
+// Name:
src/motif/
dcmemory.cpp
+// Purpose: wxMemoryDC
Impl
class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
@@
-9,16
+9,15
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-
// 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/settings.h"
-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/settings.h"
+ #include "wx/dcmemory.h"
+ #include "wx/dcclient.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-29,14
+28,15
@@
#endif
#include "wx/motif/private.h"
#endif
#include "wx/motif/private.h"
+#include "wx/motif/dcmemory.h"
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxMemoryDC, wxWindowDC
)
+IMPLEMENT_
ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl
)
-
wxMemoryDC::wxMemoryDC(void
)
+
void wxMemoryDCImpl::Init(
)
{
m_ok = true;
m_display = wxGetDisplay();
{
m_ok = true;
m_display = wxGetDisplay();
@@
-53,18
+53,19
@@
wxMemoryDC::wxMemoryDC(void)
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
- m_backgroundPixel =
(int)
gcvalues.background;
+ m_backgroundPixel = gcvalues.background;
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-}
;
+}
-wxMemoryDC::wxMemoryDC( wxDC* dc )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC* dc)
+ : wxWindowDCImpl(owner)
{
m_ok = true;
if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
{
m_ok = true;
if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
- m_display = ((wxWindowDC
*)dc
)->GetDisplay();
+ m_display = ((wxWindowDC
Impl *)dc->GetImpl()
)->GetDisplay();
else
m_display = wxGetDisplay();
else
m_display = wxGetDisplay();
@@
-80,17
+81,17
@@
wxMemoryDC::wxMemoryDC( wxDC* dc )
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
- m_backgroundPixel =
(int)
gcvalues.background;
+ m_backgroundPixel = gcvalues.background;
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
-}
;
+}
-wxMemoryDC
::~wxMemoryDC
(void)
+wxMemoryDC
Impl::~wxMemoryDCImpl
(void)
{
{
-}
;
+}
-void wxMemoryDC
::SelectObj
ect( const wxBitmap& bitmap )
+void wxMemoryDC
Impl::DoSel
ect( const wxBitmap& bitmap )
{
m_bitmap = bitmap;
{
m_bitmap = bitmap;
@@
-113,7
+114,7
@@
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
&gcvalues);
- m_backgroundPixel =
(int)
gcvalues.background;
+ m_backgroundPixel = gcvalues.background;
m_ok = true;
SetBrush (* wxWHITE_BRUSH);
m_ok = true;
SetBrush (* wxWHITE_BRUSH);
@@
-124,9
+125,9
@@
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
m_ok = false;
m_pixmap = (WXPixmap) 0;
};
m_ok = false;
m_pixmap = (WXPixmap) 0;
};
-}
;
+}
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDC
Impl
::DoGetSize( int *width, int *height ) const
{
if (m_bitmap.Ok())
{
{
if (m_bitmap.Ok())
{
@@
-138,6
+139,4
@@
void wxMemoryDC::DoGetSize( int *width, int *height ) const
if (width) (*width) = 0;
if (height) (*height) = 0;
};
if (width) (*width) = 0;
if (height) (*height) = 0;
};
-};
-
-
+}