ignore vc*_msw* build directories

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 5dfe3bdc6c011b4b1281846178a42690ca01b30e..4de0cc398d68491a1f1c3411c22b953306b6ca8b 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -43,14 +43,12 @@ public:
     // Create a DC corresponding to the whole window
     wxWindowDCImpl( wxDC *owner, wxWindow *win );
 
     // Create a DC corresponding to the whole window
     wxWindowDCImpl( wxDC *owner, wxWindow *win );
 

+    virtual void DoGetSize(int *width, int *height) const;
+

 protected:
     // initialize the newly created DC
     void InitDC();
 
 protected:
     // initialize the newly created DC
     void InitDC();
 

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

     DECLARE_CLASS(wxWindowDCImpl)
     DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
 };
     DECLARE_CLASS(wxWindowDCImpl)
     DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
 };


@@ -66,13 +64,11 @@ public:
 
     virtual ~wxClientDCImpl();
 
 
     virtual ~wxClientDCImpl();
 

+    virtual void DoGetSize(int *width, int *height) const;
+

 protected:
     void InitDC();
 
 protected:
     void InitDC();
 

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

     DECLARE_CLASS(wxClientDCImpl)
     DECLARE_NO_COPY_CLASS(wxClientDCImpl)
 };
     DECLARE_CLASS(wxClientDCImpl)
     DECLARE_NO_COPY_CLASS(wxClientDCImpl)
 };


@@ -96,7 +92,6 @@ protected:
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 

-private:

     DECLARE_CLASS(wxPaintDCImpl)
     DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
 };
     DECLARE_CLASS(wxPaintDCImpl)
     DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
 };


@@ -112,7 +107,6 @@ class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
     
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
     

-private:

     DECLARE_CLASS(wxPaintDCEx)
     DECLARE_NO_COPY_CLASS(wxPaintDCEx)
 };
     DECLARE_CLASS(wxPaintDCEx)
     DECLARE_NO_COPY_CLASS(wxPaintDCEx)
 };