projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
toolbar support in all orientations
[wxWidgets.git]
/
include
/
wx
/
msw
/
dcclient.h
diff --git
a/include/wx/msw/dcclient.h
b/include/wx/msw/dcclient.h
index 3b23d4277c067da313de9dd76963691f27b8ef6c..672615162717b6fc658d848f357aafe20b44bd37 100644
(file)
--- a/
include/wx/msw/dcclient.h
+++ b/
include/wx/msw/dcclient.h
@@
-6,7
+6,7
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCCLIENT_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCCLIENT_H_
@@
-16,11
+16,9
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "dcclient.h"
-#endif
-
#include "wx/dc.h"
#include "wx/dc.h"
+#include "wx/msw/dc.h"
+#include "wx/dcclient.h"
#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
#include "wx/dynarray.h"
// ----------------------------------------------------------------------------
@@
-28,7
+26,7
@@
// ----------------------------------------------------------------------------
// 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_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
@@
-36,56
+34,54
@@
WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
// DC classes
// ----------------------------------------------------------------------------
// DC classes
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT wxWindowDC : public wxDC
+class WXDLL
IMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl
{
public:
// default ctor
{
public:
// default ctor
- wxWindowDC
(
);
+ wxWindowDC
Impl( wxDC *owner
);
// Create a DC corresponding to the whole window
// Create a DC corresponding to the whole window
- wxWindowDC(wxWindow *win);
+ wxWindowDCImpl( wxDC *owner, wxWindow *win );
+
+ virtual void DoGetSize(int *width, int *height) const;
protected:
protected:
- // in
ti
ialize the newly created DC
+ // in
it
ialize the newly created DC
void InitDC();
void InitDC();
- // override some base class virtuals
- virtual void DoGetSize(int *width, int *height) const;
-
-private:
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)
+ DECLARE_CLASS(wxWindowDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
};
};
-class WXDLL
EXPORT wxClientDC : public wxWindowDC
+class WXDLL
IMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
{
public:
// default ctor
{
public:
// default ctor
- wxClientDC
(
);
+ wxClientDC
Impl( wxDC *owner
);
// Create a DC corresponding to the client area of the window
// Create a DC corresponding to the client area of the window
- wxClientDC(wxWindow *win);
+ wxClientDCImpl( wxDC *owner, wxWindow *win );
+
+ virtual ~wxClientDCImpl();
- virtual
~wxClientDC()
;
+ virtual
void DoGetSize(int *width, int *height) const
;
protected:
void InitDC();
protected:
void InitDC();
- // override some base class virtuals
- virtual void DoGetSize(int *width, int *height) const;
-
-private:
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)
+ DECLARE_CLASS(wxClientDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
};
};
-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 *win
);
+ wxPaintDC
Impl( wxDC *owner, wxWindow *win
);
- virtual ~wxPaintDC();
+ virtual ~wxPaintDC
Impl
();
// find the entry for this DC in the cache (keyed by the window)
static WXHDC FindDCInCache(wxWindow* win);
// find the entry for this DC in the cache (keyed by the window)
static WXHDC FindDCInCache(wxWindow* win);
@@
-96,8
+92,8
@@
protected:
// find the entry for this DC in the cache (keyed by the window)
wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
// find the entry for this DC in the cache (keyed by the window)
wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
-private:
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
+ DECLARE_CLASS(wxPaintDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
};
/*
};
/*
@@
-106,16
+102,13
@@
private:
* message. It is used in HandlePaint and need not be used by an application.
*/
* message. It is used in HandlePaint and need not be used by an application.
*/
-class WXDLL
EXPORT
wxPaintDCEx : public wxPaintDC
+class WXDLL
IMPEXP_CORE
wxPaintDCEx : public wxPaintDC
{
public:
wxPaintDCEx(wxWindow *canvas, WXHDC dc);
{
public:
wxPaintDCEx(wxWindow *canvas, WXHDC dc);
- virtual ~wxPaintDCEx();
-private:
- int saveState;
DECLARE_CLASS(wxPaintDCEx)
DECLARE_CLASS(wxPaintDCEx)
- DECLARE_NO_COPY_CLASS(wxPaintDCEx)
+ wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
};
#endif
};
#endif