Added regex to WXINC line (patch from Markus G)

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

diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i
index 8be7dabf60d5a549d838496598ab16c398a31c4d..cfddb6a4d3f5a30243dfb8de9a117f24c8024bd7 100644 (file)
--- a/wxPython/src/windows2.i
+++ b/wxPython/src/windows2.i
@@ -19,6 +19,7 @@
 #endif
 #include <wx/notebook.h>
 #include <wx/splitter.h>
 #endif
 #include <wx/notebook.h>
 #include <wx/splitter.h>

+#include <wx/imaglist.h>

 #ifdef __WXMSW__
 #include <wx/msw/taskbar.h>
 #endif
 #ifdef __WXMSW__
 #include <wx/msw/taskbar.h>
 #endif


@@ -58,9 +59,9 @@ public:
     void      SetTextValue(const wxString& str);
     wxFont&   GetFont();
     void      SetFont(wxFont& f);
     void      SetTextValue(const wxString& str);
     wxFont&   GetFont();
     void      SetFont(wxFont& f);

-    wxColour& GetTextColour();
+    wxColour GetTextColour();

     void      SetTextColour(const wxColour& colour);
     void      SetTextColour(const wxColour& colour);

-    wxColour& GetBackgroundColour();
+    wxColour GetBackgroundColour();

     void      SetBackgroundColour(const wxColour& colour);
     wxBrush&  GetBackgroundBrush();
     int       GetAlignment();
     void      SetBackgroundColour(const wxColour& colour);
     wxBrush&  GetBackgroundBrush();
     int       GetAlignment();


@@ -121,7 +122,7 @@ public:
     wxGridCell* GetCell(int row, int col);
     int GetCellAlignment(int row, int col);
     %name(GetDefCellAlignment)int GetCellAlignment();
     wxGridCell* GetCell(int row, int col);
     int GetCellAlignment(int row, int col);
     %name(GetDefCellAlignment)int GetCellAlignment();

-    wxColour& GetCellBackgroundColour(int row, int col);
+    wxColour GetCellBackgroundColour(int row, int col);

     %name(GetDefCellBackgroundColour) wxColour& GetCellBackgroundColour();
 
     //wxGridCell *** GetCells();
     %name(GetDefCellBackgroundColour) wxColour& GetCellBackgroundColour();
 
     //wxGridCell *** GetCells();


@@ -147,7 +148,7 @@ public:
             return rows;
         }
     }
             return rows;
         }
     }

-    wxColour& GetCellTextColour(int row, int col);
+    wxColour GetCellTextColour(int row, int col);

     %name(GetDefCellTextColour)wxColour& GetCellTextColour();
     wxFont& GetCellTextFont(int row, int col);
     %name(GetDefCellTextFont)wxFont& GetCellTextFont();
     %name(GetDefCellTextColour)wxColour& GetCellTextColour();
     wxFont& GetCellTextFont(int row, int col);
     %name(GetDefCellTextFont)wxFont& GetCellTextFont();


@@ -160,9 +161,9 @@ public:
     bool GetEditable();
     wxScrollBar * GetHorizScrollBar();
     int GetLabelAlignment(int orientation);
     bool GetEditable();
     wxScrollBar * GetHorizScrollBar();
     int GetLabelAlignment(int orientation);

-    wxColour& GetLabelBackgroundColour();
+    wxColour GetLabelBackgroundColour();

     int GetLabelSize(int orientation);
     int GetLabelSize(int orientation);

-    wxColour& GetLabelTextColour();
+    wxColour GetLabelTextColour();

     wxFont& GetLabelTextFont();
     wxString& GetLabelValue(int orientation, int pos);
     int GetRowHeight(int row);
     wxFont& GetLabelTextFont();
     wxString& GetLabelValue(int orientation, int pos);
     int GetRowHeight(int row);