correction for Mac OS compilation

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

diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i
index b5c4d0ebd944279b39ba60652f5485b15bd281b8..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>
+#include <wx/imaglist.h>
 #ifdef __WXMSW__
 #include <wx/msw/taskbar.h>
 #endif
@@ -58,9 +59,9 @@ public:
     void      SetTextValue(const wxString& str);
     wxFont&   GetFont();
     void      SetFont(wxFont& f);
-    wxColour& GetTextColour();
+    wxColour GetTextColour();
     void      SetTextColour(const wxColour& colour);
-    wxColour& GetBackgroundColour();
+    wxColour GetBackgroundColour();
     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();
-    wxColour& GetCellBackgroundColour(int row, int col);
+    wxColour GetCellBackgroundColour(int row, int col);
     %name(GetDefCellBackgroundColour) wxColour& GetCellBackgroundColour();
 
     //wxGridCell *** GetCells();
@@ -147,7 +148,7 @@ public:
             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();
@@ -160,9 +161,9 @@ public:
     bool GetEditable();
     wxScrollBar * GetHorizScrollBar();
     int GetLabelAlignment(int orientation);
-    wxColour& GetLabelBackgroundColour();
+    wxColour GetLabelBackgroundColour();
     int GetLabelSize(int orientation);
-    wxColour& GetLabelTextColour();
+    wxColour GetLabelTextColour();
     wxFont& GetLabelTextFont();
     wxString& GetLabelValue(int orientation, int pos);
     int GetRowHeight(int row);
@@ -242,6 +243,13 @@ enum {
 
 //---------------------------------------------------------------------------
 
+enum {
+     /* notebook control event types */
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+};
+
+
 class wxNotebookEvent : public wxNotifyEvent {
 public:
     int GetSelection();
@@ -304,6 +312,15 @@ public:
 //---------------------------------------------------------------------------
 
 
+enum {
+    /* splitter window events */
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
+    wxEVT_COMMAND_SPLITTER_UNSPLIT,
+    wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
+};
+
+
 enum
 {
     wxSPLIT_HORIZONTAL,
@@ -311,7 +328,6 @@ enum
     wxSPLIT_DRAG_NONE,
     wxSPLIT_DRAG_DRAGGING,
     wxSPLIT_DRAG_LEFT_DOWN
-
 };