mingw32 typedef's and not define's SOCKET so test for __WXMSW__ before redefining...

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 5dfe3bdc6c011b4b1281846178a42690ca01b30e..eed5e21e594f3bc94e110b6a14642071dc8109b9 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 // DC classes
 // ----------------------------------------------------------------------------
 
 // DC classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowDCImpl : public wxMSWDCImpl
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl

 {
 public:
     // default ctor
 {
 public:
     // default ctor


@@ -43,19 +43,17 @@ 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)
 };
 

-class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl

 {
 public:
     // default ctor
 {
 public:
     // default ctor


@@ -66,18 +64,16 @@ 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)
 };
 

-class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl

 {
 public:
     wxPaintDCImpl( wxDC *owner );
 {
 public:
     wxPaintDCImpl( wxDC *owner );


@@ -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)
 };


@@ -107,12 +102,11 @@ private:
  * message. It is used in HandlePaint and need not be used by an application.
  */
 
  * message. It is used in HandlePaint and need not be used by an application.
  */
 

-class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
+class WXDLLIMPEXP_CORE 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)
 };