warning fix

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

diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index cf7c3c84b946b9a00101a4264a627539ea73e02d..a7f5e4ab3bfbef365e4d4901c9ce1c351d61af4c 100644 (file)
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -55,8 +55,10 @@ IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 %}
 
 
 %}
 
 

-%name(DropSource) class wxPyDropSource {
+%rename(DropSource) wxPyDropSource;
+class wxPyDropSource {

 public:
 public:

+    %pythonAppend wxPyDropSource "self._setCallbackInfo(self, DropSource, 0)"

 #ifndef __WXGTK__
      wxPyDropSource(wxWindow *win,
                     const wxCursor &copy = wxNullCursor,
 #ifndef __WXGTK__
      wxPyDropSource(wxWindow *win,
                     const wxCursor &copy = wxNullCursor,


@@ -70,14 +72,13 @@ public:
 #endif
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
 #endif
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);

-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxDropSource, 0)"

     ~wxPyDropSource();
 
     // set the data which is transfered by drag and drop
     void SetData(wxDataObject& data);
     ~wxPyDropSource();
 
     // set the data which is transfered by drag and drop
     void SetData(wxDataObject& data);

-    
+

     wxDataObject *GetDataObject();
     wxDataObject *GetDataObject();

-    
+

     // set the icon corresponding to given drag result
     void SetCursor(wxDragResult res, const wxCursor& cursor);
 
     // set the icon corresponding to given drag result
     void SetCursor(wxDragResult res, const wxCursor& cursor);
 


@@ -115,7 +116,8 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop);
 %}
 
 
 %}
 
 

-%name(DropTarget) class wxPyDropTarget // : public wxDropTarget
+%rename(DropTarget) wxPyDropTarget;
+class wxPyDropTarget // : public wxDropTarget

 {
 public:
     %pythonAppend wxPyDropTarget
 {
 public:
     %pythonAppend wxPyDropTarget


@@ -178,7 +180,8 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop);
 
 %}
 
 
 %}
 

-%name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget {
+%rename(TextDropTarget) wxPyTextDropTarget;
+class wxPyTextDropTarget : public wxPyDropTarget {

 public:
     %pythonAppend wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
 
 public:
     %pythonAppend wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
 


@@ -216,7 +219,7 @@ public:
 
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {
 
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {

-    bool rval = False;
+    bool rval = false;

     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
         PyObject* list = wxArrayString2PyList_helper(filenames);
     bool blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
         PyObject* list = wxArrayString2PyList_helper(filenames);


@@ -238,7 +241,8 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop);
 %}
 
 
 %}
 
 

-%name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget
+%rename(FileDropTarget) wxPyFileDropTarget;
+class wxPyFileDropTarget : public wxPyDropTarget

 {
 public:
     %pythonAppend wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"
 {
 public:
     %pythonAppend wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"