API and etc. updates

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

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 9dec8acb3583f0ac207871a32893fa5109605850..b446de9d06412db6a14219817d2cc06eaff44b5f 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -660,7 +660,7 @@ public:
     wxString GetHelpText() const;
 
 
-
+#ifndef __WXX11__
     // tooltips
     // --------
 
@@ -673,9 +673,11 @@ public:
     // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const;
     // LINK ERROR --> wxString GetToolTipText() const;
+#endif
 
 
-
+    
+#ifndef __WXX11__
     // drag and drop
     // -------------
 
@@ -688,7 +690,8 @@ public:
 #ifdef __WXMSW__  // TODO:  should I drop-kick this?
     void DragAcceptFiles(bool accept);
 #endif
-
+#endif
+    
 
     // constraints and sizers
     // ----------------------
@@ -807,7 +810,7 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
         win->SubclassWin(hWnd);
         return win;
 #else
-        PyErr_SetNone(PyExc_NotImplementedError);
+        wxPyRaiseNotImplemented();
         return NULL;
 #endif
     }