avoiding crash for pure modifier events

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 6399130d1c397a6aa4ffaf5ddc63f5f650033163..eed5e21e594f3bc94e110b6a14642071dc8109b9 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -17,6 +17,8 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/dc.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/dc.h"

+#include "wx/msw/dc.h"
+#include "wx/dcclient.h"

 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------


@@ -32,56 +34,54 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 // DC classes
 // ----------------------------------------------------------------------------
 
 // DC classes
 // ----------------------------------------------------------------------------
 

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

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

-    wxWindowDC();
+    wxWindowDCImpl( wxDC *owner );

 
     // Create a DC corresponding to the whole window
 
     // Create a DC corresponding to the whole window

-    wxWindowDC(wxWindow *win);
+    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_DYNAMIC_CLASS_NO_COPY(wxWindowDC)
+    DECLARE_CLASS(wxWindowDCImpl)
+    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)

 };
 
 };
 

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

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

-    wxClientDC();
+    wxClientDCImpl( wxDC *owner );

 
     // Create a DC corresponding to the client area of the window
 
     // Create a DC corresponding to the client area of the window

-    wxClientDC(wxWindow *win);
+    wxClientDCImpl( wxDC *owner, wxWindow *win );

 
 

-    virtual ~wxClientDC();
+    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_DYNAMIC_CLASS_NO_COPY(wxClientDC)
+    DECLARE_CLASS(wxClientDCImpl)
+    DECLARE_NO_COPY_CLASS(wxClientDCImpl)

 };
 
 };
 

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

 {
 public:
 {
 public:

-    wxPaintDC();
+    wxPaintDCImpl( wxDC *owner );

 
     // Create a DC corresponding for painting the window in OnPaint()
 
     // Create a DC corresponding for painting the window in OnPaint()

-    wxPaintDC(wxWindow *win);
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 

-    virtual ~wxPaintDC();
+    virtual ~wxPaintDCImpl();

 
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);
 
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);


@@ -92,8 +92,8 @@ 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_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
+    DECLARE_CLASS(wxPaintDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)

 };
 
 /*
 };
 
 /*


@@ -102,14 +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);

-    virtual ~wxPaintDCEx();
-private:
-    int saveState;
-
+    

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