Various changes needed to get up to date with current CVS

[wxWidgets.git] / wxPython / src / windows.i

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index ca44e8ddb53d95ea147d325ffac632b4039a4526..aaecd697c87f2e93f0ee12a7266cadedacf1d5fb 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -202,7 +202,7 @@ public:
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 
-    void Clear();
+    void ClearBackground();
 
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
@@ -879,10 +879,16 @@ public:
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     //void SetBitmap(const wxBitmap& bmpChecked);
     //wxBitmap GetBitmap(bool bChecked = TRUE);
+    
+    void SetDisabledBitmap( const wxBitmap& bmpDisabled );
+    const wxBitmap& GetDisabledBitmap() const;
+   
     void SetMarginWidth(int nWidth);
     int GetMarginWidth();
     static int GetDefaultMarginWidth();
     bool IsOwnerDrawn();
+    // switch on/off owner-drawing the item
+    void SetOwnerDrawn(bool ownerDrawn = TRUE);
     void ResetOwnerDrawn();
 #endif