projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a couple duplicate feature checks, and check for defines before setting them...
[wxWidgets.git]
/
include
/
wx
/
motif
/
dcmemory.h
diff --git
a/include/wx/motif/dcmemory.h
b/include/wx/motif/dcmemory.h
index 40434bd5f4c2c060940dfa06c519b5e5d438fcd6..2ef13d624775a005e372cca8163d7c7d30663117 100644
(file)
--- a/
include/wx/motif/dcmemory.h
+++ b/
include/wx/motif/dcmemory.h
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
-// Purpose: wxMemoryDC class
+// Name:
wx/motif/
dcmemory.h
+// Purpose: wxMemoryDC
Impl
class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
@@
-12,32
+12,34
@@
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
-#ifdef __GNUG__
- #pragma interface "dcmemory.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/motif/dcclient.h"
-class
wxMemoryDC : public wxWindowDC
+class
WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
{
{
-DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
public:
public:
- wxMemoryDC();
- wxMemoryDC( wxDC *dc ); // Create compatible DC
- ~wxMemoryDC();
+ wxMemoryDCImpl(wxMemoryDC *owner) : wxWindowDCImpl(owner) { Init(); }
+ wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+ : wxWindowDCImpl(owner)
+ {
+ Init();
+ DoSelect(bitmap);
+ }
- virtual void SelectObject( const wxBitmap& bitmap );
+ wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc);
+ virtual ~wxMemoryDCImpl();
- void GetSize( int *width, int *height ) const;
-
- wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+ virtual void DoGetSize( int *width, int *height ) const;
+ virtual void DoSelect(const wxBitmap& bitmap);
private:
private:
- friend wxPaintDC;
+ friend class wxPaintDC;
+
+ void Init();
+
+ wxBitmap m_bitmap;
- wxBitmap m_bitmap;
+ DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
};
#endif
};
#endif
-
// _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_