#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index 21d1a42e53304c5d702b3d5052e8350b1081f245..a69cbd7126713093168ed59f10bff232bdd3ec06 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.h
 // Purpose:     wxClientDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.h
 // Purpose:     wxClientDC class

-// Author:      Julian Smart
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     09/12/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) David Webster
+// 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/os2/dc.h"
+#include "wx/dcclient.h"

 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------


@@ -28,58 +26,78 @@
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only

-struct WXDLLEXPORT wxPaintDCInfo;
+struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;

 
 

-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

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

-class WXDLLEXPORT wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl

 {
 {

-    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 *pWin );

 
 

-    virtual ~wxWindowDC();
-};
+    virtual void DoGetSize(int *pWidth, int *pHeight) const;

 
 

-class WXDLLEXPORT wxClientDC : public wxWindowDC
-{
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+protected:
+    // initialize the newly created DC
+    void InitDC(void);
+
+private:
+    SIZEL                   m_PageSize;
+    DECLARE_CLASS(wxWindowDCImpl)
+    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+}; // end of CLASS wxWindowDC

 
 

+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
+{

 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 *pWin );

 
 

-    virtual ~wxClientDC();
-};
+    virtual ~wxClientDCImpl();

 
 

-class WXDLLEXPORT wxPaintDC : public wxWindowDC
-{
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    virtual void DoGetSize(int *pWidth, int *pHeight) const;
+
+protected:
+    void InitDC(void);
+
+private:
+    DECLARE_CLASS(wxClientDCImpl)
+    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+}; // end of CLASS wxClientDC

 
 

+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
+{

 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 *pWin );
+
+    virtual ~wxPaintDCImpl();

 
 

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

 
 protected:
     static wxArrayDCInfo ms_cache;
 
     // find the entry for this DC in the cache (keyed by the window)
 
 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;
-};
+    wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
+private:
+    DECLARE_CLASS(wxPaintDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+}; // end of wxPaintDC

 
 #endif
     // _WX_DCCLIENT_H_
 
 #endif
     // _WX_DCCLIENT_H_