Changes needed to enable wxGTK compatibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index c4fa456c05dc5e9d21b9fd441b15895787185433..c4cc53f2c028d19a40b232a5f96d82d160dca244 100644 (file)
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -524,9 +524,16 @@ public:
     wxImageList(int width, int height, const bool mask=TRUE, int initialCount=1);
     ~wxImageList();
 
     wxImageList(int width, int height, const bool mask=TRUE, int initialCount=1);
     ~wxImageList();
 

+#ifdef __WXMSW__

     int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
     %name(AddWithColourMask)int Add(const wxBitmap& bitmap, const wxColour& maskColour);
     %name(AddIcon)int Add(const wxIcon& icon);
     int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
     %name(AddWithColourMask)int Add(const wxBitmap& bitmap, const wxColour& maskColour);
     %name(AddIcon)int Add(const wxIcon& icon);

+    bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
+    %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon);
+#else
+    int Add(const wxBitmap& bitmap);
+    bool Replace(int index, const wxBitmap& bitmap);
+#endif

 
     bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL,
               const bool solidBackground = FALSE);
 
     bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL,
               const bool solidBackground = FALSE);


@@ -534,8 +541,6 @@ public:
     int GetImageCount();
     bool Remove(int index);
     bool RemoveAll();
     int GetImageCount();
     bool Remove(int index);
     bool RemoveAll();

-    bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
-    %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon);

 };
 
 
 };
 
 


@@ -544,6 +549,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.14  1999/02/20 10:02:36  RD
+// Changes needed to enable wxGTK compatibility.
+//

 // Revision 1.13  1999/02/20 09:02:58  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,
 // Revision 1.13  1999/02/20 09:02:58  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,

diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index b0b149507d5ae1f372bac3d09dd71742ff5f2aa2..7c3205c38e029e255238e1571eed887d71e9efd1 100644 (file)
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -388,7 +388,9 @@ public:
 
     void SetTip(const wxString& tip);
     wxString GetTip();
 
     void SetTip(const wxString& tip);
     wxString GetTip();

+#ifndef __WXGTK__

     void SetWindow(wxWindow *win);
     void SetWindow(wxWindow *win);

+#endif

     wxWindow *GetWindow();
 };
 
     wxWindow *GetWindow();
 };
 


@@ -407,6 +409,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.12  1999/02/20 10:02:37  RD
+// Changes needed to enable wxGTK compatibility.
+//

 // Revision 1.11  1999/02/20 09:03:01  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,
 // Revision 1.11  1999/02/20 09:03:01  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 26d4ee63a3d492dfe4820974343d3a950e79e209..f11e6c859402bcd697fa42f85175987d6129216a 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -64,7 +64,9 @@ public:
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);
     %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);
     %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);

+#ifndef __WXGTK__

     wxPoint ClientToScreen(const wxPoint& pt);
     wxPoint ClientToScreen(const wxPoint& pt);

+#endif

     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();


@@ -118,7 +120,9 @@ public:
     void Lower();
     void MakeModal(bool flag);
     %name(MoveXY)void Move(int x, int y);
     void Lower();
     void MakeModal(bool flag);
     %name(MoveXY)void Move(int x, int y);

+#ifndef __WXGTK__

     void Move(const wxPoint& point);
     void Move(const wxPoint& point);

+#endif

 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);


@@ -128,7 +132,9 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
     %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
     %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);

+#ifndef __WXGTK__

     wxPoint ScreenToClient(const wxPoint& pt);
     wxPoint ScreenToClient(const wxPoint& pt);

+#endif

 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);


@@ -158,7 +164,9 @@ public:
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     %name(SetClientSizeWH)void SetClientSize(int width, int height);

+#ifndef __WXGTK__

     void SetClientSize(const wxSize& size);
     void SetClientSize(const wxSize& size);

+#endif

     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);


@@ -287,7 +295,9 @@ public:
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);

+#ifndef __WXGTK__

     %name(AppendItem)void Append(const wxMenuItem* item);
     %name(AppendItem)void Append(const wxMenuItem* item);

+#endif

 
     void AppendSeparator();
     void Break();
 
     void AppendSeparator();
     void Break();


@@ -370,6 +380,9 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.13  1999/02/20 10:02:38  RD
+// Changes needed to enable wxGTK compatibility.
+//

 // Revision 1.12  1999/02/20 09:03:03  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,
 // Revision 1.12  1999/02/20 09:03:03  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,