projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add RunScript and implement on all backends. Document and add a very simple unit...
[wxWidgets.git]
/
include
/
wx
/
os2
/
dcclient.h
diff --git
a/include/wx/os2/dcclient.h
b/include/wx/os2/dcclient.h
index a884c23ab44b3caebb785f1ef583cc2734eda3e5..f80673c34c74f49323f2bd83f9f782ff212f622c 100644
(file)
--- a/
include/wx/os2/dcclient.h
+++ b/
include/wx/os2/dcclient.h
@@
-1,12
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name:
wx/os2/
dcclient.h
// Purpose: wxClientDC class
// Author: David Webster
// Modified by:
// Created: 09/12/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Purpose: wxClientDC class
// Author: David Webster
// Modified by:
// Created: 09/12/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCCLIENT_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCCLIENT_H_
@@
-17,6
+17,8
@@
// ----------------------------------------------------------------------------
#include "wx/dc.h"
// ----------------------------------------------------------------------------
#include "wx/dc.h"
+#include "wx/os2/dc.h"
+#include "wx/dcclient.h"
#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
@@
-24,70
+26,65
@@
// ----------------------------------------------------------------------------
// this one if used by wxPaintDC only
// ----------------------------------------------------------------------------
// this one if used by wxPaintDC only
-struct WXDLL
EXPORT
wxPaintDCInfo;
+struct WXDLL
IMPEXP_FWD_CORE
wxPaintDCInfo;
-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+WX_DECLARE_
EXPORTED_
OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
// ----------------------------------------------------------------------------
// DC classes
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// DC classes
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT wxWindowDC : public wxDC
+class WXDLL
IMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl
{
public:
{
public:
- wxWindowDC();
+ // default ctor
+ wxWindowDCImpl( wxDC *owner );
- //
// Create a DC corresponding to the whole window
// Create a DC corresponding to the whole window
- //
- wxWindowDC(wxWindow* pWin);
+ wxWindowDCImpl( wxDC *owner, wxWindow *pWin );
+
+ virtual void DoGetSize(int *pWidth, int *pHeight) const;
protected:
protected:
+ // initialize the newly created DC
void InitDC(void);
void InitDC(void);
- //
- // Override some base class virtuals
- //
- virtual void DoGetSize( int* pWidth
- ,int* pHeight
- ) const;
-
private:
SIZEL m_PageSize;
private:
SIZEL m_PageSize;
- DECLARE_DYNAMIC_CLASS(wxWindowDC)
+ DECLARE_CLASS(wxWindowDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
}; // end of CLASS wxWindowDC
}; // end of CLASS wxWindowDC
-class WXDLL
EXPORT wxClientDC : public wxWindowDC
+class WXDLL
IMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
{
public:
{
public:
- wxClientDC();
- virtual ~wxClientDC();
+ // default ctor
+ wxClientDCImpl( wxDC *owner );
+
+ // Create a DC corresponding to the client area of the window
+ wxClientDCImpl( wxDC *owner, wxWindow *pWin );
- wxClientDC(wxWindow *win);
+ virtual ~wxClientDCImpl();
+
+ virtual void DoGetSize(int *pWidth, int *pHeight) const;
protected:
void InitDC(void);
protected:
void InitDC(void);
- //
- // Override some base class virtuals
- //
- virtual void DoGetSize( int* pWidth
- ,int* pHeight
- ) const;
-
private:
private:
- DECLARE_DYNAMIC_CLASS(wxClientDC)
+ DECLARE_CLASS(wxClientDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
}; // end of CLASS wxClientDC
}; // end of CLASS wxClientDC
-class WXDLL
EXPORT wxPaintDC : public wxClientDC
+class WXDLL
IMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
{
public:
{
public:
- wxPaintDC
(
);
+ wxPaintDC
Impl( wxDC *owner
);
// Create a DC corresponding for painting the window in OnPaint()
// Create a DC corresponding for painting the window in OnPaint()
- wxPaintDC
(wxWindow* pWin
);
+ wxPaintDC
Impl( wxDC *owner, wxWindow *pWin
);
- virtual ~wxPaintDC();
+ virtual ~wxPaintDC
Impl
();
// find the entry for this DC in the cache (keyed by the window)
static WXHDC FindDCInCache(wxWindow* pWin);
// find the entry for this DC in the cache (keyed by the window)
static WXHDC FindDCInCache(wxWindow* pWin);
@@
-98,7
+95,8
@@
protected:
// find the entry for this DC in the cache (keyed by the window)
wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
private:
// find the entry for this DC in the cache (keyed by the window)
wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
private:
- DECLARE_DYNAMIC_CLASS(wxPaintDC)
+ DECLARE_CLASS(wxPaintDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
}; // end of wxPaintDC
#endif
}; // end of wxPaintDC
#endif