Fix wxWrapSizer minimal size calculation.

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 5957aa5c22855d0ead61a10533451dc22c17f7e4..672615162717b6fc658d848f357aafe20b44bd37 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -43,10 +43,6 @@ 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 );
 

-#if wxUSE_GRAPHICS_CONTEXT
-    virtual wxGraphicsContext* CreateGraphicsContext();
-#endif
-

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


@@ -54,7 +50,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxWindowDCImpl)
     void InitDC();
 
     DECLARE_CLASS(wxWindowDCImpl)

-    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);

 };
 
 class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
 };
 
 class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl


@@ -74,7 +70,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxClientDCImpl)
     void InitDC();
 
     DECLARE_CLASS(wxClientDCImpl)

-    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);

 };
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
 };
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl


@@ -97,7 +93,7 @@ protected:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
     DECLARE_CLASS(wxPaintDCImpl)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
     DECLARE_CLASS(wxPaintDCImpl)

-    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);

 };
 
 /*
 };
 
 /*


@@ -110,9 +106,9 @@ class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);

-    
+

     DECLARE_CLASS(wxPaintDCEx)
     DECLARE_CLASS(wxPaintDCEx)

-    DECLARE_NO_COPY_CLASS(wxPaintDCEx)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);

 };
 
 #endif
 };
 
 #endif