solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Beginning to make wxDC code compile both before

Browse source 
and after the DC reorg to make the transition
    smoother (indeed possible).
  Move the wxImplDC code to its future place in
    dcbase.cpp and wx/dc.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2007-05-08 23:47:43 +00:00
parent 4263bab00e
commit 2970ae54d3
6 changed files with 2504 additions and 2234 deletions
Download patch file Download diff file Expand all files Collapse all files

35
include/wx/gtk/dcclient.h
View file

@ -19,13 +19,18 @@ class WXDLLIMPEXP_CORE wxWindow;
// wxWindowDC
//-----------------------------------------------------------------------------
#if wxUSE_NEW_DC
class WXDLLIMPEXP_CORE wxGTKWindowImplDC : public wxGTKImplDC
#else
#define wxGTKWindowImplDC wxWindowDC
class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
#endif
{
public:
wxWindowDC();
wxWindowDC( wxWindow *win );
wxGTKWindowImplDC();
wxGTKWindowImplDC( wxWindow *win );
virtual ~wxWindowDC();
virtual ~wxGTKWindowImplDC();
virtual bool CanDrawBitmap() const { return true; }
virtual bool CanGetTextExtent() const { return true; }
@ -129,38 +134,48 @@ public:
virtual GdkWindow *GetGDKWindow() const { return m_window; }
private:
DECLARE_DYNAMIC_CLASS(wxWindowDC)
DECLARE_DYNAMIC_CLASS(wxGTKWindowImplDC)
};
//-----------------------------------------------------------------------------
// wxClientDC
//-----------------------------------------------------------------------------
#if wxUSE_NEW_DC
class WXDLLIMPEXP_CORE wxGTKClientImplDC : public wxGTKWindowImplDC
#else
#define wxGTKClientImplDC wxClientDC
class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
#endif
{
public:
wxClientDC() { }
wxClientDC( wxWindow *win );
wxGTKClientImplDC() { }
wxGTKClientImplDC( wxWindow *win );
protected:
virtual void DoGetSize(int *width, int *height) const;
private:
DECLARE_DYNAMIC_CLASS(wxClientDC)
DECLARE_DYNAMIC_CLASS(wxGTKClientImplDC)
};
//-----------------------------------------------------------------------------
// wxPaintDC
//-----------------------------------------------------------------------------
#if wxUSE_NEW_DC
class WXDLLIMPEXP_CORE wxGTKPaintImplDC : public wxGTKClientImplDC
#else
#define wxGTKPaintImplDC wxPaintDC
class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
#endif
{
public:
wxPaintDC() { }
wxPaintDC( wxWindow *win );
wxGTKPaintImplDC() { }
wxGTKPaintImplDC( wxWindow *win );
private:
DECLARE_DYNAMIC_CLASS(wxPaintDC)
DECLARE_DYNAMIC_CLASS(wxGTKPaintImplDC)
};
#endif // __GTKDCCLIENTH__