Compilation fix.

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 16949da89b9f4d1cb5970ee624cd1e58403c6160..4de0cc398d68491a1f1c3411c22b953306b6ca8b 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_


@@ -16,11 +16,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #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,61 +26,89 @@
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only

-struct WXDLLEXPORT wxPaintDCInfo;
+struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;

 
 

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

 
 // ----------------------------------------------------------------------------
 // DC classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // DC classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowDC : public wxDC
+class WXDLLEXPORT wxWindowDCImpl : public wxMSWDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 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 *win);
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );
+
+    virtual void DoGetSize(int *width, int *height) const;
+
+protected:
+    // initialize the newly created DC
+    void InitDC();

 
 

-    virtual ~wxWindowDC();
+    DECLARE_CLASS(wxWindowDCImpl)
+    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)

 };
 
 };
 

-class WXDLLEXPORT wxClientDC : public wxWindowDC
+class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
 public:

-    wxClientDC();
+    // default ctor
+    wxClientDCImpl( 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 void DoGetSize(int *width, int *height) const;
+
+protected:
+    void InitDC();

 
 

-    virtual ~wxClientDC();
+    DECLARE_CLASS(wxClientDCImpl)
+    DECLARE_NO_COPY_CLASS(wxClientDCImpl)

 };
 
 };
 

-class WXDLLEXPORT wxPaintDC : public wxWindowDC
+class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
 public:

-    wxPaintDC();
+    wxPaintDCImpl( 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);
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 

-    virtual ~wxPaintDC();
+    virtual ~wxPaintDCImpl();
+
+    // find the entry for this DC in the cache (keyed by the window)
+    static WXHDC FindDCInCache(wxWindow* win);

 
 protected:
     static wxArrayDCInfo ms_cache;
 
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
 protected:
     static wxArrayDCInfo ms_cache;
 
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;

+
+    DECLARE_CLASS(wxPaintDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+};
+
+/*
+ * wxPaintDCEx
+ * This class is used when an application sends an HDC with the WM_PAINT
+ * message. It is used in HandlePaint and need not be used by an application.
+ */
+
+class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
+{
+public:
+    wxPaintDCEx(wxWindow *canvas, WXHDC dc);
+    
+    DECLARE_CLASS(wxPaintDCEx)
+    DECLARE_NO_COPY_CLASS(wxPaintDCEx)

 };
 
 #endif
 };
 
 #endif