SWIGged update for wxGTK

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

diff --git a/wxPython/src/gtk/clip_dnd.cpp b/wxPython/src/gtk/clip_dnd.cpp
index 50ccd63b9c3394d46493cfcf3bf88502a4f39bd1..92e302c86fd7b7b60fc6f88e02317fa1045d0a30 100644 (file)
--- a/wxPython/src/gtk/clip_dnd.cpp
+++ b/wxPython/src/gtk/clip_dnd.cpp
@@ -196,8 +196,12 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
     }
     wxPyEndBlockThreads();
 }
     }
     wxPyEndBlockThreads();
 }

+
+#if 0

 extern wxClipboard * wxTheClipboard; 
 
 extern wxClipboard * wxTheClipboard; 
 

+#endif
+

 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__
 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__

diff --git a/wxPython/src/gtk/controls.cpp b/wxPython/src/gtk/controls.cpp
index 7d4ea9b9b810fbbc4fda109448166d50f0b1b42d..7aa0a60db06fc27a2197dd2b747ecd04f565a1c1 100644 (file)
--- a/wxPython/src/gtk/controls.cpp
+++ b/wxPython/src/gtk/controls.cpp
@@ -3633,7 +3633,11 @@ static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args, PyObjec
 }
 
 static PyObject * wxComboBox_GetClientData(wxComboBox *self,int  n) {
 }
 
 static PyObject * wxComboBox_GetClientData(wxComboBox *self,int  n) {

+#ifdef __WXMAC__
+            wxPyClientData* data = (wxPyClientData*)self->wxItemContainer::GetClientObject(n);
+#else

             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);

+#endif

             if (data) {
                 Py_INCREF(data->m_obj);
                 return data->m_obj;
             if (data) {
                 Py_INCREF(data->m_obj);
                 return data->m_obj;


@@ -3674,7 +3678,11 @@ static PyObject *_wrap_wxComboBox_GetClientData(PyObject *self, PyObject *args,
 
 static void  wxComboBox_SetClientData(wxComboBox *self,int  n,PyObject * clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);
 
 static void  wxComboBox_SetClientData(wxComboBox *self,int  n,PyObject * clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);

+#ifdef __WXMAC__
+            self->wxItemContainer::SetClientObject(n, data);
+#else

             self->SetClientObject(n, data);
             self->SetClientObject(n, data);

+#endif

         }
 static PyObject *_wrap_wxComboBox_SetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
         }
 static PyObject *_wrap_wxComboBox_SetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

diff --git a/wxPython/src/gtk/windows2.cpp b/wxPython/src/gtk/windows2.cpp
index 9bb776322f762fc39165403e0861686f9d9c41f9..6197c025af2976edee5f49fc17e744c36a33366b 100644 (file)
--- a/wxPython/src/gtk/windows2.cpp
+++ b/wxPython/src/gtk/windows2.cpp
@@ -59,7 +59,7 @@ extern PyObject *SWIG_newvarlink(void);
 #include <wx/splitter.h>
 #include <wx/imaglist.h>
 #ifdef __WXMSW__
 #include <wx/splitter.h>
 #include <wx/imaglist.h>
 #ifdef __WXMSW__

-#include <wx/msw/taskbar.h>
+#include <wx/taskbar.h>

 #endif
 
     // Put some wx default wxChar* values into wxStrings.
 #endif
 
     // Put some wx default wxChar* values into wxStrings.