disable (some) features that are not available in DirectFB

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 5a00c3cd2fe69dda31629043cdb275c1e89bffe2..dccf727b8954180a308eac4897f2544f731b9ad1 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -36,7 +36,7 @@ public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 

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

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


@@ -92,11 +92,11 @@ protected:
     // 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
     // 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

-    int CalculatePixel(wxColour& colour, wxColour& curCol,
-                       bool roundToWhite) const;
+    WXPixel CalculatePixel(wxColour& colour, wxColour& curCol,
+                           bool roundToWhite) const;

     // sets the foreground pixel taking into account the
     // currently selected logical operation
     // sets the foreground pixel taking into account the
     // currently selected logical operation

-    void SetForegroundPixelWithLogicalFunction(int pixel);
+    void SetForegroundPixelWithLogicalFunction(WXPixel pixel);

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


@@ -153,7 +153,7 @@ protected:
     WXRegion     m_clipRegion;
 
     // Not sure if we'll need all of these
     WXRegion     m_clipRegion;
 
     // Not sure if we'll need all of these

-    int          m_backgroundPixel;
+    WXPixel      m_backgroundPixel;

     wxColour     m_currentColour;
     int          m_currentPenWidth ;
     int          m_currentPenJoin ;
     wxColour     m_currentColour;
     int          m_currentPenWidth ;
     int          m_currentPenJoin ;


@@ -174,7 +174,7 @@ public:
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);
 
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);
 

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

 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC