hack to allow icons in wxStaticBitmap as well as bitmaps

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 05743e7ec3b58722c20397416d6c17694d0a50f6..182b71b68683e49a4dc4a8afeef3d7cfb9138044 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DCCLIENTH__
-#define __DCCLIENTH__
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_
 
 #ifdef __GNUG__
 #pragma interface "dcclient.h"
@@ -18,33 +18,33 @@
 
 #include "wx/dc.h"
 
-class WXDLLEXPORT wxClientDC: public wxDC
+class WXDLLEXPORT wxWindowDC: public wxDC
 {
-  DECLARE_DYNAMIC_CLASS(wxClientDC)
+  DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
  public:
-  wxClientDC(void);
+  wxWindowDC(void);
 
   // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
+  wxWindowDC(wxWindow *win);
 
-  ~wxClientDC(void);
+  ~wxWindowDC(void);
 };
 
-class WXDLLEXPORT wxWindowDC: public wxDC
+class WXDLLEXPORT wxClientDC: public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxWindowDC)
+  DECLARE_DYNAMIC_CLASS(wxClientDC)
 
  public:
-  wxWindowDC(void);
+  wxClientDC(void);
 
   // Create a DC corresponding to a canvas
-  wxWindowDC(wxWindow *win);
+  wxClientDC(wxWindow *win);
 
-  ~wxWindowDC(void);
+  ~wxClientDC(void);
 };
 
-class WXDLLEXPORT wxPaintDC: public wxDC
+class WXDLLEXPORT wxPaintDC: public wxWindowDC
 {
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 
@@ -57,9 +57,9 @@ class WXDLLEXPORT wxPaintDC: public wxDC
   ~wxPaintDC(void);
 
  protected:
-    static WXHDC m_staticPaintHDC ;
-    static int m_staticPaintCount ;
+    static WXHDC ms_PaintHDC;
+    static size_t  ms_PaintCount;
 };
 
 #endif
-    // __DCCLIENTH__
+    // _WX_DCCLIENT_H_