Minor tweaks and some typos fixed

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

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 8474a1fa0160fd845ca28685685b19788b3c6b94..f80dd7e1caca279ebc25c9340925c3c464eaaef4 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -87,8 +87,8 @@ public:
 #endif
 
     wxBitmap GetSubBitmap( const wxRect& rect );
 #endif
 
     wxBitmap GetSubBitmap( const wxRect& rect );

-#ifdef __WXMSW__

     bool CopyFromIcon(const wxIcon& icon);
     bool CopyFromIcon(const wxIcon& icon);

+#ifdef __WXMSW__

     bool CopyFromCursor(const wxCursor& cursor);
     int GetQuality();
     void SetQuality(int q);
     bool CopyFromCursor(const wxCursor& cursor);
     int GetQuality();
     void SetQuality(int q);


@@ -598,7 +598,6 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-

 class wxPen : public wxGDIObject {
 public:
     wxPen(wxColour& colour, int width=1, int style=wxSOLID);
 class wxPen : public wxGDIObject {
 public:
     wxPen(wxColour& colour, int width=1, int style=wxSOLID);


@@ -618,7 +617,7 @@ public:
     void SetWidth(int width);
 
             // **** This one needs to return a list of ints (wxDash)
     void SetWidth(int width);
 
             // **** This one needs to return a list of ints (wxDash)

-    int GetDashes(wxDash **dashes);
+    //int GetDashes(wxDash **dashes);

     void SetDashes(int LCOUNT, wxDash* choices);
 
 #ifdef __WXMSW__
     void SetDashes(int LCOUNT, wxDash* choices);
 
 #ifdef __WXMSW__


@@ -628,6 +627,42 @@ public:
 };
 
 
 };
 
 

+
+%{
+class wxPyPen : public wxPen {
+public:
+    wxPyPen(wxColour& colour, int width=1, int style=wxSOLID)
+        : wxPen(colour, width, style)
+        { m_dash = NULL; }
+    ~wxPyPen() {
+        if (m_dash)
+            delete m_dash;
+    }
+
+    void SetDashes(int nb_dashes, const wxDash *dash) {
+        m_dash = new wxDash[nb_dashes];
+        for (int i=0; i<nb_dashes; i++)
+            m_dash[i] = dash[i];
+        wxPen::SetDashes(nb_dashes, m_dash);
+    }
+
+private:
+    wxDash* m_dash;
+};
+%}
+
+
+
+class wxPyPen : public wxPen {
+public:
+    wxPyPen(wxColour& colour, int width=1, int style=wxSOLID);
+    ~wxPyPen();
+
+    void SetDashes(int LCOUNT, wxDash* choices);
+};
+
+
+

 class wxPenList : public wxObject {
 public:
 
 class wxPenList : public wxObject {
 public:
 


@@ -655,7 +690,7 @@ public:
 };
 
 
 };
 
 

-class wxBrushList {
+class wxBrushList : public wxObject {

 public:
 
     void AddBrush(wxBrush *brush);
 public:
 
     void AddBrush(wxBrush *brush);


@@ -917,7 +952,7 @@ extern wxColour wxNullColour;
 
 extern wxFontList*       wxTheFontList;
 extern wxPenList*        wxThePenList;
 
 extern wxFontList*       wxTheFontList;
 extern wxPenList*        wxThePenList;

-extern wxBrushlist*      wxTheBrushList;
+extern wxBrushList*      wxTheBrushList;

 extern wxColourDatabase* wxTheColourDatabase;
 
 
 extern wxColourDatabase* wxTheColourDatabase;