Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index ec974c1bb308c7eba3f24a3c40d643d85ab4e4d4..b1db3e481fb52dc128306369a4c8d287703a1f95 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -90,7 +90,19 @@ public:
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
     
 protected:
-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    // 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);
     
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;