moved Esc processing from wxWindow to wxDialog where it belongs; use the -- to be...

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index ccf5927bf2e01091cf926c57d87997c5ada4b675..67ed7c64468f67bfc7bef123ff7ec22dbfda1864 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,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dcclient.h"
 #endif
 
     #pragma interface "dcclient.h"
 #endif
 


@@ -46,14 +46,14 @@ public:
     wxWindowDC(wxWindow *win);
 
 protected:
     wxWindowDC(wxWindow *win);
 
 protected:

-    // intiialize the newly created DC
+    // initialize the newly created DC

     void InitDC();
 
     // override some base class virtuals
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
     void InitDC();
 
     // override some base class virtuals
     virtual void DoGetSize(int *width, int *height) const;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)

 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC


@@ -74,7 +74,7 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)

 };
 
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 };
 
 class WXDLLEXPORT wxPaintDC : public wxClientDC


@@ -97,7 +97,25 @@ protected:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
 private:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
+};
+
+/*
+ * 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);
+    virtual ~wxPaintDCEx();
+private:
+    int saveState;
+
+    DECLARE_CLASS(wxPaintDCEx)
+    DECLARE_NO_COPY_CLASS(wxPaintDCEx)

 };
 
 #endif
 };
 
 #endif