first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/dcclient.h

@@ -62,11 +62,16 @@ public:
     // Create a DC corresponding to the client area of the window
     wxClientDC(wxWindow *win);
 
+    virtual ~wxClientDC();
+
+protected:
+    void InitDC();
+
 private:
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
-class WXDLLEXPORT wxPaintDC : public wxWindowDC
+class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
     wxPaintDC();