projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use /bin/echo for creation of Mac OS X PkgInfo files.
[wxWidgets.git]
/
include
/
wx
/
osx
/
dcmemory.h
diff --git
a/include/wx/osx/dcmemory.h
b/include/wx/osx/dcmemory.h
index 6e4f1e0845cb061c2ea6c7f45cafcd5d015cfa88..97250267776908c16d38a842a3a843b94dc53a81 100644
(file)
--- a/
include/wx/osx/dcmemory.h
+++ b/
include/wx/osx/dcmemory.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name:
wx/osx/
dcmemory.h
// Purpose: wxMemoryDC class
// Author: Stefan Csomor
// Modified by:
// Purpose: wxMemoryDC class
// Author: Stefan Csomor
// Modified by:
@@
-19,12
+19,12
@@
class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
public:
wxMemoryDCImpl( wxMemoryDC *owner );
wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
public:
wxMemoryDCImpl( wxMemoryDC *owner );
wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
- wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
-
+ wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+
virtual ~wxMemoryDCImpl();
virtual void DoGetSize( int *width, int *height ) const;
virtual ~wxMemoryDCImpl();
virtual void DoGetSize( int *width, int *height ) const;
- virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
+ virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
virtual void DoSelect(const wxBitmap& bitmap);
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
virtual void DoSelect(const wxBitmap& bitmap);
@@
-32,14
+32,14
@@
public:
{ return m_selected; }
virtual wxBitmap& GetSelectedBitmap()
{ return m_selected; }
{ return m_selected; }
virtual wxBitmap& GetSelectedBitmap()
{ return m_selected; }
-
+
private:
void Init();
wxBitmap m_selected;
private:
void Init();
wxBitmap m_selected;
-
+
DECLARE_CLASS(wxMemoryDCImpl)
DECLARE_CLASS(wxMemoryDCImpl)
- DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
};
#endif
};
#endif