correction for Mac OS compilation

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

diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i
index 0a0658dc6b938834c692d6a0908a9cf590cb30b6..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();


@@ -75,8 +76,8 @@ public:
 class wxGrid : public wxPanel {
 public:
     wxGrid(wxWindow* parent, wxWindowID id,
 class wxGrid : public wxPanel {
 public:
     wxGrid(wxWindow* parent, wxWindowID id,

-           const wxPoint& pos=wxPyDefaultPosition,
-           const wxSize& size=wxPyDefaultSize,
+           const wxPoint& pos=wxDefaultPosition,
+           const wxSize& size=wxDefaultSize,

            long style=0,
            char* name="grid");
 
            long style=0,
            char* name="grid");
 


@@ -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);


@@ -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();
 class wxNotebookEvent : public wxNotifyEvent {
 public:
     int GetSelection();


@@ -256,8 +264,8 @@ class wxNotebook : public wxControl {
 public:
     wxNotebook(wxWindow *parent,
                wxWindowID id,
 public:
     wxNotebook(wxWindow *parent,
                wxWindowID id,

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                long style = 0,
                char* name = "notebook");
 
                long style = 0,
                char* name = "notebook");
 


@@ -275,8 +283,8 @@ public:
     bool SetPageImage(int nPage, int nImage);
     int GetRowCount();
 
     bool SetPageImage(int nPage, int nImage);
     int GetRowCount();
 

-    // LINK ERROR: void SetPageSize(const wxSize& size);
-    // LINK ERROR: void SetPadding(const wxSize& padding);
+    void SetPageSize(const wxSize& size);
+    void SetPadding(const wxSize& padding);

     bool DeletePage(int nPage);
     bool RemovePage(int nPage);
     bool DeleteAllPages();
     bool DeletePage(int nPage);
     bool RemovePage(int nPage);
     bool DeleteAllPages();


@@ -284,13 +292,11 @@ public:
                  const wxString& strText,
                  int bSelect = FALSE,
                  int imageId = -1);
                  const wxString& strText,
                  int bSelect = FALSE,
                  int imageId = -1);

-#ifdef __WXMSW__

     bool InsertPage(int nPage,
                     /*wxNotebookPage*/ wxWindow *pPage,
                     const wxString& strText,
                     bool bSelect = FALSE,
                     int imageId = -1);
     bool InsertPage(int nPage,
                     /*wxNotebookPage*/ wxWindow *pPage,
                     const wxString& strText,
                     bool bSelect = FALSE,
                     int imageId = -1);

-#endif

     /*wxNotebookPage*/ wxWindow *GetPage(int nPage);
 
     %addmethods {
     /*wxNotebookPage*/ wxWindow *GetPage(int nPage);
 
     %addmethods {


@@ -306,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,
 enum
 {
     wxSPLIT_HORIZONTAL,


@@ -313,7 +328,6 @@ enum
     wxSPLIT_DRAG_NONE,
     wxSPLIT_DRAG_DRAGGING,
     wxSPLIT_DRAG_LEFT_DOWN
     wxSPLIT_DRAG_NONE,
     wxSPLIT_DRAG_DRAGGING,
     wxSPLIT_DRAG_LEFT_DOWN

-

 };
 
 
 };
 
 


@@ -332,8 +346,8 @@ public:
 class wxSplitterWindow : public wxWindow {
 public:
     wxSplitterWindow(wxWindow* parent, wxWindowID id,
 class wxSplitterWindow : public wxWindow {
 public:
     wxSplitterWindow(wxWindow* parent, wxWindowID id,

-                     const wxPoint& point = wxPyDefaultPosition,
-                     const wxSize& size = wxPyDefaultSize,
+                     const wxPoint& point = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,

                      long style=wxSP_3D|wxCLIP_CHILDREN,
                      char* name = "splitterWindow");
 
                      long style=wxSP_3D|wxCLIP_CHILDREN,
                      char* name = "splitterWindow");
 


@@ -380,6 +394,7 @@ public:
     wxTaskBarIcon();
     ~wxTaskBarIcon();
 
     wxTaskBarIcon();
     ~wxTaskBarIcon();
 

+    // We still use the magic methods here since that is the way it is documented...

     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonUp',    wxEVT_TASKBAR_LEFT_UP)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove',    wxEVT_TASKBAR_MOVE)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown',  wxEVT_TASKBAR_LEFT_DOWN)"
     %pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonUp',    wxEVT_TASKBAR_LEFT_UP)"


@@ -391,7 +406,8 @@ public:
     bool SetIcon(const wxIcon& icon, const char* tooltip = "");
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu);
     bool SetIcon(const wxIcon& icon, const char* tooltip = "");
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu);

-
+    bool IsIconInstalled();
+    bool IsOK();

 };
 #endif
 
 };
 #endif