Script updates

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

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 6bd8cd52646dd8d8215fa936e5eb844e286cafbe..d6d9ad156edbcccdd358f410b2a95c48bd906594 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -26,8 +26,8 @@ MAKE_CONST_WXSTRING(PanelNameStr);
 class wxWindow : public wxEvtHandler
 {
 public:
 class wxWindow : public wxEvtHandler
 {
 public:

-    %addtofunc wxWindow         "self._setOORInfo(self)"
-    %addtofunc wxWindow()       ""
+    %pythonAppend wxWindow         "self._setOORInfo(self)"
+    %pythonAppend wxWindow()       ""

 
     wxWindow(wxWindow* parent, const wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
 
     wxWindow(wxWindow* parent, const wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,


@@ -546,13 +546,13 @@ public:
 
     DocDeclAStr(
         void, GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT),
 
     DocDeclAStr(
         void, GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT),

-        "GetTextExtent(wxString string) -> (width, height)",
+        "GetTextExtent(String string) -> (width, height)",

         "Get the width and height of the text using the current font.");
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT, 
                             const wxFont* font = NULL),
         "Get the width and height of the text using the current font.");
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT, 
                             const wxFont* font = NULL),

-        "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
+        "GetFullTextExtent(String string, Font font=None) ->\n   (width, height, descent, externalLeading)",

         "Get the width, height, decent and leading of the text using the current or specified font.",
         GetFullTextExtent);
 
         "Get the width, height, decent and leading of the text using the current or specified font.",
         GetFullTextExtent);
 


@@ -660,7 +660,7 @@ public:
     wxString GetHelpText() const;
 
 
     wxString GetHelpText() const;
 
 

-
+#ifndef __WXX11__

     // tooltips
     // --------
 
     // tooltips
     // --------
 


@@ -673,22 +673,27 @@ public:
     // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const;
     // LINK ERROR --> wxString GetToolTipText() const;
     // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const;
     // LINK ERROR --> wxString GetToolTipText() const;

+#endif

 
 
 
 

-
+    
+#ifndef __WXX11__

     // drag and drop
     // -------------
 
     // set/retrieve the drop target associated with this window (may be
     // NULL; it's owned by the window and will be deleted by it)
     // drag and drop
     // -------------
 
     // set/retrieve the drop target associated with this window (may be
     // NULL; it's owned by the window and will be deleted by it)

-    %addtofunc SetDropTarget "args[1].thisown = 0"
+    %apply SWIGTYPE *DISOWN { wxPyDropTarget *dropTarget };

     virtual void SetDropTarget( wxPyDropTarget *dropTarget );
     virtual void SetDropTarget( wxPyDropTarget *dropTarget );

+    %clear wxPyDropTarget *dropTarget;
+    

     virtual wxPyDropTarget *GetDropTarget() const;
 
 #ifdef __WXMSW__  // TODO:  should I drop-kick this?
     void DragAcceptFiles(bool accept);
 #endif
     virtual wxPyDropTarget *GetDropTarget() const;
 
 #ifdef __WXMSW__  // TODO:  should I drop-kick this?
     void DragAcceptFiles(bool accept);
 #endif

-
+#endif
+    

 
     // constraints and sizers
     // ----------------------
 
     // constraints and sizers
     // ----------------------


@@ -807,7 +812,7 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
         win->SubclassWin(hWnd);
         return win;
 #else
         win->SubclassWin(hWnd);
         return win;
 #else

-        PyErr_SetNone(PyExc_NotImplementedError);
+        wxPyRaiseNotImplemented();

         return NULL;
 #endif
     }
         return NULL;
 #endif
     }