X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/src/_stockobjs.i?ds=sidebyside

diff --git a/wxPython/src/_stockobjs.i b/wxPython/src/_stockobjs.i
index 655e891000..7ae7546af4 100644
--- a/wxPython/src/_stockobjs.i
+++ b/wxPython/src/_stockobjs.i
@@ -17,6 +17,63 @@
 %newgroup
 
 
+// See also wxPy_ReinitStockObjects in helpers.cpp
+%immutable;
+
+wxFont* const wxNORMAL_FONT;
+wxFont* const wxSMALL_FONT;
+wxFont* const wxITALIC_FONT;
+wxFont* const wxSWISS_FONT;
+
+wxPen* const wxRED_PEN;
+wxPen* const wxCYAN_PEN;
+wxPen* const wxGREEN_PEN;
+wxPen* const wxBLACK_PEN;
+wxPen* const wxWHITE_PEN;
+wxPen* const wxTRANSPARENT_PEN;
+wxPen* const wxBLACK_DASHED_PEN;
+wxPen* const wxGREY_PEN;
+wxPen* const wxMEDIUM_GREY_PEN;
+wxPen* const wxLIGHT_GREY_PEN;
+
+wxBrush* const wxBLUE_BRUSH;
+wxBrush* const wxGREEN_BRUSH;
+wxBrush* const wxWHITE_BRUSH;
+wxBrush* const wxBLACK_BRUSH;
+wxBrush* const wxTRANSPARENT_BRUSH;
+wxBrush* const wxCYAN_BRUSH;
+wxBrush* const wxRED_BRUSH;
+wxBrush* const wxGREY_BRUSH;
+wxBrush* const wxMEDIUM_GREY_BRUSH;
+wxBrush* const wxLIGHT_GREY_BRUSH;
+
+wxColour* const wxBLACK;
+wxColour* const wxWHITE;
+wxColour* const wxRED;
+wxColour* const wxBLUE;
+wxColour* const wxGREEN;
+wxColour* const wxCYAN;
+wxColour* const wxLIGHT_GREY;
+
+wxCursor* const wxSTANDARD_CURSOR;
+wxCursor* const wxHOURGLASS_CURSOR;
+wxCursor* const wxCROSS_CURSOR;
+
+
+const wxBitmap wxNullBitmap;
+const wxIcon   wxNullIcon;
+const wxCursor wxNullCursor;
+const wxPen    wxNullPen;
+const wxBrush  wxNullBrush;
+const wxPalette wxNullPalette;
+const wxFont   wxNullFont;
+const wxColour wxNullColour;
+
+%mutable;
+
+
+//---------------------------------------------------------------------------
+
 class wxPenList : public wxObject {
 public:
 
@@ -34,7 +91,7 @@ class wxBrushList : public wxObject {
 public:
 
     void AddBrush(wxBrush *brush);
-    wxBrush * FindOrCreateBrush(const wxColour& colour, int style);
+    wxBrush * FindOrCreateBrush(const wxColour& colour, int style=wxSOLID);
     void RemoveBrush(wxBrush *brush);
 
     int GetCount();
@@ -42,6 +99,8 @@ public:
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxColourDatabase);
+
 class wxColourDatabase : public wxObject {
 public:
     wxColourDatabase();
@@ -69,7 +128,7 @@ public:
 
     void AddFont(wxFont* font);
     wxFont * FindOrCreateFont(int point_size, int family, int style, int weight,
-                              bool underline = FALSE, const wxString& facename = wxPyEmptyString,
+                              bool underline = false, const wxString& facename = wxPyEmptyString,
                               wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     void RemoveFont(wxFont *font);
 
@@ -84,56 +143,6 @@ public:
 // See also wxPy_ReinitStockObjects in helpers.cpp
 %immutable;
 
-wxFont* const wxNORMAL_FONT;
-wxFont* const wxSMALL_FONT;
-wxFont* const wxITALIC_FONT;
-wxFont* const wxSWISS_FONT;
-
-wxPen* const wxRED_PEN;
-wxPen* const wxCYAN_PEN;
-wxPen* const wxGREEN_PEN;
-wxPen* const wxBLACK_PEN;
-wxPen* const wxWHITE_PEN;
-wxPen* const wxTRANSPARENT_PEN;
-wxPen* const wxBLACK_DASHED_PEN;
-wxPen* const wxGREY_PEN;
-wxPen* const wxMEDIUM_GREY_PEN;
-wxPen* const wxLIGHT_GREY_PEN;
-
-wxBrush* const wxBLUE_BRUSH;
-wxBrush* const wxGREEN_BRUSH;
-wxBrush* const wxWHITE_BRUSH;
-wxBrush* const wxBLACK_BRUSH;
-wxBrush* const wxTRANSPARENT_BRUSH;
-wxBrush* const wxCYAN_BRUSH;
-wxBrush* const wxRED_BRUSH;
-wxBrush* const wxGREY_BRUSH;
-wxBrush* const wxMEDIUM_GREY_BRUSH;
-wxBrush* const wxLIGHT_GREY_BRUSH;
-
-wxColour* const wxBLACK;
-wxColour* const wxWHITE;
-wxColour* const wxRED;
-wxColour* const wxBLUE;
-wxColour* const wxGREEN;
-wxColour* const wxCYAN;
-wxColour* const wxLIGHT_GREY;
-
-wxCursor* const wxSTANDARD_CURSOR;
-wxCursor* const wxHOURGLASS_CURSOR;
-wxCursor* const wxCROSS_CURSOR;
-
-
-const wxBitmap wxNullBitmap;
-const wxIcon   wxNullIcon;
-const wxCursor wxNullCursor;
-const wxPen    wxNullPen;
-const wxBrush  wxNullBrush;
-const wxPalette wxNullPalette;
-const wxFont   wxNullFont;
-const wxColour wxNullColour;
-
-
 wxFontList*       const wxTheFontList;
 wxPenList*        const wxThePenList;
 wxBrushList*      const wxTheBrushList;
@@ -144,3 +153,8 @@ wxColourDatabase* const wxTheColourDatabase;
 
 //---------------------------------------------------------------------------
  
+%pythoncode { NullColor = NullColour }
+
+
+
+