Remove usused variable

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index de67be70f80ebdf12c6873ffd1936558755cdb16..627df84efd939716d025064245dd62d962c2c215 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -6,81 +6,75 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcclient.h"
-#endif
-

 #include "wx/dc.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 wxWindow;
-
-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

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

-// wxWindowDC
+// wxWindowDCImpl

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

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

 {
 public:
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
-    
-    ~wxWindowDC();
-    
-    virtual bool CanDrawBitmap() const { return TRUE; }
-    virtual bool CanGetTextExtent() const { return TRUE; }
+    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 DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
 
 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 DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;

-    
+

     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

-    
+

     virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
     virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,

-                               bool useMask = FALSE );
+                               bool useMask = false );

 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
         wxCoord x2, wxCoord y2,
         wxCoord xc, wxCoord yc);
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
         double sa, double ea);
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
         wxCoord x2, wxCoord y2,
         wxCoord xc, wxCoord yc);
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
         double sa, double ea);

-    
+

     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height,
         double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height,
         double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    
+

     virtual void DoCrossHair(wxCoord x, wxCoord y);
     virtual void DoCrossHair(wxCoord x, wxCoord y);

-    
+

     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);

-    
+

     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);
-    
+        int 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 DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);

-    
+

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


@@ -90,7 +84,7 @@ protected:
 
 public:
     virtual void Clear();
 
 public:
     virtual void Clear();

-    
+

     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);


@@ -98,30 +92,34 @@ public:
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetLogicalFunction( int function );
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetLogicalFunction( int function );

-    
+

     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);

-    
+

     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
     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 int GetDepth() const;
     virtual wxSize GetPPI() const;

-    
+

     virtual void DestroyClippingRegion();
     virtual void DestroyClippingRegion();

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

 
 

-protected:    
+    virtual void ComputeScaleAndOrigin();
+
+protected:

     // implementation
     // --------------
     // 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;


@@ -129,7 +127,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;
 


@@ -140,41 +137,40 @@ protected:
 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();

-    void ComputeScaleAndOrigin();

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_CLASS(wxWindowDCImpl)

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

-class 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 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