projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make operators for comparing wxString and wx[W]CharBuffer available in both builds
[wxWidgets.git]
/
include
/
wx
/
mgl
/
dcmemory.h
diff --git
a/include/wx/mgl/dcmemory.h
b/include/wx/mgl/dcmemory.h
index 4e005bb1842e6f043d65d9306caa52ceaf072fa1..39804f20f119018863af0b84b582aad3c2fed5bb 100644
(file)
--- a/
include/wx/mgl/dcmemory.h
+++ b/
include/wx/mgl/dcmemory.h
@@
-3,18
+3,13
@@
// Purpose:
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose:
// Author: Vaclav Slavik
// RCS-ID: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001
-2002
SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#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/defs.h"
#include "wx/dcclient.h"
#include "wx/defs.h"
#include "wx/dcclient.h"
@@
-28,13
+23,13
@@
class WXDLLEXPORT wxMemoryDC;
// wxMemoryDC
//-----------------------------------------------------------------------------
// wxMemoryDC
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxMemoryDC : public wxDC
+class WXDLLEXPORT wxMemoryDC : public wxDC
, public wxMemoryDCBase
{
public:
{
public:
- wxMemoryDC();
+ wxMemoryDC() { Init(); }
+ wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
wxMemoryDC(wxDC *dc); // Create compatible DC
wxMemoryDC(wxDC *dc); // Create compatible DC
- ~wxMemoryDC();
- virtual void SelectObject(const wxBitmap& bitmap);
+ virtual ~wxMemoryDC();
// these get reimplemented for mono-bitmaps to behave
// more like their Win32 couterparts. They now interpret
// these get reimplemented for mono-bitmaps to behave
// more like their Win32 couterparts. They now interpret
@@
-50,7
+45,12
@@
public:
wxBitmap GetSelectedObject() const { return m_selected; }
wxBitmap GetSelectedObject() const { return m_selected; }
+protected:
+ virtual void DoSelect(const wxBitmap& bitmap);
+
private:
private:
+ void Init();
+
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
};
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
};