wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 4edf65a924b0064a98cd892af01b6a1e11e79721..86f6ce73ee0515e075972573f130cccb1909311e 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.h
-// Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
+// Name:        wx/motif/dcclient.h
+// Purpose:     wxClientDCImpl, wxPaintDCImpl and wxWindowDCImpl classes

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -12,35 +12,21 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#ifdef __GNUG__
-    #pragma interface "dcclient.h"
-#endif
+#include "wx/motif/dc.h"

 
 

-#include "wx/dc.h"
-
-// -----------------------------------------------------------------------------
-// fwd declarations
-// -----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxWindowDC;
-class WXDLLEXPORT wxWindow;
-
-// Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented
-// differently. On many platforms, however, they will be the same.
+class WXDLLIMPEXP_FWD_CORE wxWindow;

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

-// wxWindowDC
+// wxWindowDCImpl

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

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
 public:

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

 
 

-    ~wxWindowDC();
+    virtual ~wxWindowDCImpl();

 
     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);
 
     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);


@@ -64,10 +50,10 @@ public:
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
     virtual void DoGetTextExtent(const wxString& string,
     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;
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        const wxFont *theFont = NULL) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;


@@ -78,7 +64,7 @@ public:
     virtual void DestroyClippingRegion();
 
     // Helper function for setting clipping
     virtual void DestroyClippingRegion();
 
     // Helper function for setting clipping

-    void SetDCClipping();
+    void SetDCClipping(WXRegion region);

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -86,12 +72,24 @@ public:
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }

-    bool GetAutoSetting() const { return m_autoSetting; }
+    bool GetAutoSetting() const { return (m_autoSetting != 0); } // See comment in dcclient.cpp

     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
 
 protected:
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
 
 protected:

-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE);
+    // note that this function will call colour.SetPixel,
+    // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
+    // roundToWhite has an effect for monochrome display only
+    // if roundToWhite == true then the colour will be set to white unless
+    // it is RGB 0x000000;if roundToWhite == true the colour wull be set to
+    // black unless it id RGB 0xffffff
+    WXPixel CalculatePixel(wxColour& colour, wxColour& curCol,
+                           bool roundToWhite) const;
+    // sets the foreground pixel taking into account the
+    // currently selected logical operation
+    void SetForegroundPixelWithLogicalFunction(WXPixel pixel);
+
+    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 bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
 


@@ -99,82 +97,86 @@ protected:
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,

-                           wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc);
+        wxCoord x2, wxCoord y2,
+        wxCoord xc, wxCoord yc);

     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,

-                                   double sa, double ea);
+        double sa, double ea);

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

-                                        wxCoord width, wxCoord height,
-                                        double radius);
+        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 DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
     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 bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc,
-            int rop = wxCOPY, bool useMask = FALSE);
+        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+        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,
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,

-            wxCoord width, wxCoord height);
+        wxCoord width, wxCoord height);
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);

 
     virtual void DoDrawLines(int n, wxPoint points[],
 
     virtual void DoDrawLines(int n, wxPoint points[],

-            wxCoord xoffset, wxCoord yoffset);
+        wxCoord xoffset, wxCoord yoffset);

     virtual void DoDrawPolygon(int n, wxPoint points[],
     virtual void DoDrawPolygon(int n, wxPoint points[],

-            wxCoord xoffset, wxCoord yoffset,
-            int fillStyle = wxODDEVEN_RULE);
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle = wxODDEVEN_RULE);
+
+    void DoGetSize( int *width, int *height ) const;

 
 

-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList *points);
-#endif // wxUSE_SPLINES
+    // common part of constructors
+    void Init();

 
     WXGC         m_gc;
     WXGC         m_gcBacking;
     WXDisplay*   m_display;
     wxWindow*    m_window;
 
     WXGC         m_gc;
     WXGC         m_gcBacking;
     WXDisplay*   m_display;
     wxWindow*    m_window;

-    WXRegion     m_currentRegion; // Current clipping region (incl. paint clip region)
-    WXRegion     m_userRegion;    // User-defined clipping region
-    WXPixmap     m_pixmap;        // Pixmap for drawing on
+    // Pixmap for drawing on
+    WXPixmap     m_pixmap;
+    // Last clipping region set on th GC, this is the combination
+    // of paint clipping region and all user-defined clipping regions
+    WXRegion     m_clipRegion;

 
     // Not sure if we'll need all of these
 
     // Not sure if we'll need all of these

-    int          m_backgroundPixel;
+    WXPixel      m_backgroundPixel;

     wxColour     m_currentColour;
     wxColour     m_currentColour;

-    //    int          m_currentBkMode;

     int          m_currentPenWidth ;
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenDashCount ;
     int          m_currentPenWidth ;
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenDashCount ;

-    char*        m_currentPenDash ;
+    wxX11Dash*   m_currentPenDash ;

     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp
     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp

-    WXFont       m_oldFont;
+
+    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)

 };
 
 };
 

-class WXDLLEXPORT wxPaintDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
 public:

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

 
 

-    ~wxPaintDC();
+    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)

 };
 
 };
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
 public:

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

 };
 
 };
 

-#endif
-    // _WX_DCCLIENT_H_
+#endif // _WX_DCCLIENT_H_