avoid GCC warning about type-punned pointer breaking strict aliasing rules

[wxWidgets.git] / include / wx / mac / carbon / dcclient.h

diff --git a/include/wx/mac/carbon/dcclient.h b/include/wx/mac/carbon/dcclient.h
index 448d6b4322412460163bba40925893afd8e8cd30..a35e461720a755f1e6f44167c8d04a5ec6e26136 100644 (file)
--- a/include/wx/mac/carbon/dcclient.h
+++ b/include/wx/mac/carbon/dcclient.h
@@ -13,6 +13,7 @@
 #define _WX_DCCLIENT_H_
 
 #include "wx/dc.h"
 #define _WX_DCCLIENT_H_
 
 #include "wx/dc.h"

+#include "wx/dcgraph.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -21,59 +22,51 @@
 class WXDLLIMPEXP_FWD_CORE wxPaintDC;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxPaintDC;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 

-class WXDLLEXPORT wxWindowDC: public wxDC
+class WXDLLEXPORT wxWindowDCImpl: public wxGCDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
- public:
-  wxWindowDC(void);
-
-  // Create a DC corresponding to a canvas
-  wxWindowDC(wxWindow *win);
-
-  virtual ~wxWindowDC(void);
-  wxWindow *GetWindow() const { return m_window; }
-  protected :
+public:
+    wxWindowDCImpl( wxDC *owner );
+    wxWindowDCImpl( wxDC *owner, wxWindow *window );
+    virtual ~wxWindowDCImpl();
+    

     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; 
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; 

-    wxWindow     *m_window;

 
 

-       bool            m_release;
-       int                     m_width;
-       int                     m_height;
+protected:
+    bool m_release;
+    int         m_width;
+    int         m_height;

 
 

+    DECLARE_CLASS(wxWindowDCImpl)
+    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)

 };
 
 
 };
 
 

-class WXDLLEXPORT wxClientDC: public wxWindowDC
+class WXDLLEXPORT wxClientDCImpl: public wxWindowDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxClientDC)
-
- public:
-  wxClientDC(void);
-
-  // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
-
-  virtual ~wxClientDC(void);
-
-protected:
+public:
+    wxClientDCImpl( wxDC *owner );
+    wxClientDCImpl( wxDC *owner, wxWindow *window );
+    virtual ~wxClientDCImpl();
+    
+private:
+    DECLARE_CLASS(wxClientDCImpl)
+    DECLARE_NO_COPY_CLASS(wxClientDCImpl)

 };
 
 };
 

-class WXDLLEXPORT wxPaintDC: public wxWindowDC
-{
-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
- public:
-  wxPaintDC(void);

 
 

-  // Create a DC corresponding to a canvas
-  wxPaintDC(wxWindow *win);
-
-  virtual ~wxPaintDC(void);
+class WXDLLEXPORT wxPaintDCImpl: public wxWindowDCImpl
+{
+public:
+    wxPaintDCImpl( wxDC *owner );
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );
+    virtual ~wxPaintDCImpl();

 
 protected:
 
 protected:

+    DECLARE_CLASS(wxPaintDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)

 };
 
 };
 

+

 #endif
     // _WX_DCCLIENT_H_
 #endif
     // _WX_DCCLIENT_H_