added wxString::FromAscii(char*,size_t) for consistency with FromUTF8()

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

diff --git a/wxPython/src/_stockobjs.i b/wxPython/src/_stockobjs.i
index 8eb9289ffa9c46308590df88e46961c51b51ba68..a8a2500fe9ed5161a2823699c8a72315d6d22869 100644 (file)
--- a/wxPython/src/_stockobjs.i
+++ b/wxPython/src/_stockobjs.i
@@ -171,14 +171,15 @@ STANDARD_CURSOR   = Cursor.__new__(Cursor)
 %immutable;
 %threadWrapperOff;
 
-const wxBitmap wxNullBitmap;
-const wxIcon   wxNullIcon;
-const wxCursor wxNullCursor;
-const wxPen    wxNullPen;
-const wxBrush  wxNullBrush;
-const wxPalette wxNullPalette;
-const wxFont   wxNullFont;
-const wxColour wxNullColour;
+const wxBitmap     wxNullBitmap;
+const wxIcon       wxNullIcon;
+const wxCursor     wxNullCursor;
+const wxPen        wxNullPen;
+const wxBrush      wxNullBrush;
+const wxPalette    wxNullPalette;
+const wxFont       wxNullFont;
+const wxColour     wxNullColour;
+const wxIconBundle wxNullIconBundle;
 
 %threadWrapperOn;
 %mutable;
@@ -198,14 +199,6 @@ class wxPenList : public wxGDIObjListBase {
 public:
 
     wxPen* FindOrCreatePen(const wxColour& colour, int width, int style);
-
-    void AddPen(wxPen* pen);
-    void RemovePen(wxPen* pen);
-    %pythoncode {
-        AddPen = wx._deprecated(AddPen)
-        RemovePen = wx._deprecated(RemovePen)
-    }            
-//    int GetCount();
 };
 
 
@@ -213,14 +206,6 @@ class wxBrushList : public wxGDIObjListBase {
 public:
 
     wxBrush * FindOrCreateBrush(const wxColour& colour, int style=wxSOLID);
-
-    void AddBrush(wxBrush *brush);
-    void RemoveBrush(wxBrush *brush);
-    %pythoncode {
-        AddBrush = wx._deprecated(AddBrush)
-        RemoveBrush = wx._deprecated(RemoveBrush)
-    }
-//    int GetCount();
 };
 
 
@@ -231,15 +216,6 @@ public:
                               bool underline = false,
                               const wxString& facename = wxPyEmptyString,
                               wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    void AddFont(wxFont* font);
-    void RemoveFont(wxFont *font);
-    %pythoncode {
-        AddFont = wx._deprecated(AddFont)
-        RemoveFont = wx._deprecated(RemoveFont)
-    }
-
-//    int GetCount();
 };
 
 //---------------------------------------------------------------------------