forward declare wxMenu

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 5288b917634046b5fbaf1f7deeeb46d2ca00b721..a92cc083cb3c091c1857b9ae4bcd87edc1ee394a 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -90,6 +90,18 @@ public:
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
     
 protected:
+    // 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 == FALSE the colour wull be set to
+    // black unless it id RGB 0xffffff
+    int CalculatePixel(wxColour& colour, wxColour& curCol,
+                       bool roundToWhite) const;
+    // sets the foreground pixel taking into account the
+    // currently selected logical operation
+    void SetForegroundPixelWithLogicalFunction(int pixel);
+
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
         int style = wxFLOOD_SURFACE);
     
@@ -145,7 +157,7 @@ protected:
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenDashCount ;
-    wxMOTIFDash* m_currentPenDash ;
+    wxX11Dash*   m_currentPenDash ;
     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;