Fixed parts of toolbar background not being drawn with older comctl32.dll.

[wxWidgets.git] / include / wx / osx / dcclient.h

diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index 280167a2cb0f01152a43656a80e32478e908dad4..4be10a57f135b9d787ba9a2bacad0a2c102978d9 100644 (file)
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -1,5 +1,72 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/dcclient.h"
-#else
-#include "wx/osx/carbon/dcclient.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/dcclient.h
+// Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_
+
+#include "wx/dc.h"
+#include "wx/dcgraph.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxGCDCImpl
+{
+public:
+    wxWindowDCImpl( wxDC *owner );
+    wxWindowDCImpl( wxDC *owner, wxWindow *window );
+    virtual ~wxWindowDCImpl();
+
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+
+protected:
+    bool m_release;
+    int m_width;
+    int m_height;
+
+    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
+};
+
+
+class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
+{
+public:
+    wxClientDCImpl( wxDC *owner );
+    wxClientDCImpl( wxDC *owner, wxWindow *window );
+    virtual ~wxClientDCImpl();
+
+private:
+    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
+};
+
+
+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
+{
+public:
+    wxPaintDCImpl( wxDC *owner );
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );
+    virtual ~wxPaintDCImpl();
+
+protected:
+    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
+};
+
+
 #endif
+    // _WX_DCCLIENT_H_