fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 1af2a6c7393fbf957121d81e7a1eb9fa695887f1..e3a52fe81c930c0bb1a170cdadfb9bc9c876e4cd 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -13,36 +13,35 @@
 #define _WX_DCCLIENT_H_
 
 #include "wx/dc.h"
 #define _WX_DCCLIENT_H_
 
 #include "wx/dc.h"

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

 #include "wx/region.h"
 
 // -----------------------------------------------------------------------------
 // fwd declarations
 // -----------------------------------------------------------------------------
 
 #include "wx/region.h"
 
 // -----------------------------------------------------------------------------
 // fwd declarations
 // -----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxWindowDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxWindowDC
+// wxWindowDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxX11DCImpl

 {
 public:
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
-
-    ~wxWindowDC();
+    wxWindowDCImpl( wxDC *owner );
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );
+        
+    virtual ~wxWindowDCImpl();

 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;

-    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE );
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, 
+                              wxFloodFillStyle style = wxFLOOD_SURFACE );

     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
 
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
 
     virtual void DoDrawPoint(wxCoord x, wxCoord y);


@@ -71,17 +70,18 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+        wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

 
 

-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);

+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);

 
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset,
 
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset,

-        int fillStyle = wxODDEVEN_RULE);
+        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

 
 
 public:
 
 
 public:


@@ -93,31 +93,35 @@ public:
     virtual void SetBackground(const wxBrush& brush);
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetBackground(const wxBrush& brush);
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);

-    virtual void SetLogicalFunction( int function );
+    virtual void SetLogicalFunction( wxRasterOperationMode function );

 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;

-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        wxFont *theFont = NULL) const;

 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual void DestroyClippingRegion();
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual void DestroyClippingRegion();

-    WXWindow GetWindow() const { return m_window; }
+    WXWindow GetX11Window() const { return m_x11window; }
+
+    virtual void ComputeScaleAndOrigin();

 
 protected:
     // implementation
     // --------------
 
 protected:
     // implementation
     // --------------

+    virtual void DoGetTextExtent(const wxString& string,
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        const wxFont *theFont = NULL) const;
+
+    void Init();

 
     WXDisplay    *m_display;
 
     WXDisplay    *m_display;

-    WXWindow      m_window;
+    WXWindow      m_x11window;

     WXGC          m_penGC;
     WXGC          m_brushGC;
     WXGC          m_textGC;
     WXGC          m_penGC;
     WXGC          m_brushGC;
     WXGC          m_textGC;


@@ -125,7 +129,6 @@ protected:
     WXColormap    m_cmap;
     bool          m_isMemDC;
     bool          m_isScreenDC;
     WXColormap    m_cmap;
     bool          m_isMemDC;
     bool          m_isScreenDC;

-    wxWindow     *m_owner;

     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 


@@ -136,41 +139,40 @@ protected:
 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();

-    virtual void ComputeScaleAndOrigin();

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_CLASS(wxWindowDCImpl)

 };
 
 //-----------------------------------------------------------------------------
 // wxClientDC
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxClientDC
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxClientDC() { }
-    wxClientDC( wxWindow *win );
+    wxClientDCImpl( wxDC *owner ) : wxWindowDCImpl( owner ) { }
+    wxClientDCImpl( wxDC *owner, wxWindow *win );

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

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_CLASS(wxClientDCImpl)

 };
 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win );
+    wxPaintDCImpl( wxDC *owner ) : wxClientDCImpl( owner ) { }
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_CLASS(wxPaintDCImpl)

 };
 
 #endif
 };
 
 #endif