Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 766b28cd28790be460f12f34ff03fa3e3d7cb02f..6399130d1c397a6aa4ffaf5ddc63f5f650033163 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma interface "dcclient.h"
-#endif
-

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


@@ -28,7 +24,7 @@
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only
 // ----------------------------------------------------------------------------
 
 // this one if used by wxPaintDC only

-struct WXDLLEXPORT wxPaintDCInfo;
+struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;

 
 WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 


@@ -46,14 +42,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 +70,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 +93,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