fix building/running of tex2rtf

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

diff --git a/wxPython/src/_dragimg.i b/wxPython/src/_dragimg.i
index 7e6a3ebc2c8bd8233a4b054b6464a6b7ffc10c0b..94f0d19fdf06749a996eba39e2d6ae42b21e2131 100644 (file)
--- a/wxPython/src/_dragimg.i
+++ b/wxPython/src/_dragimg.i
@@ -24,22 +24,25 @@
 
 
 
 
 
 

-%name (DragImage) class wxGenericDragImage : public wxObject
+MustHaveApp(wxGenericDragImage);
+
+%rename (DragImage) wxGenericDragImage;
+class wxGenericDragImage : public wxObject

 {
 public:
 
     wxGenericDragImage(const wxBitmap& image,
                        const wxCursor& cursor = wxNullCursor);
     
 {
 public:
 
     wxGenericDragImage(const wxBitmap& image,
                        const wxCursor& cursor = wxNullCursor);
     

-    %name(DragIcon)wxGenericDragImage(const wxIcon& image,
-                                        const wxCursor& cursor = wxNullCursor);
+    %RenameCtor(DragIcon, wxGenericDragImage(const wxIcon& image,
+                                        const wxCursor& cursor = wxNullCursor));

 
 

-    %name(DragString)wxGenericDragImage(const wxString& str,
-                                          const wxCursor& cursor = wxNullCursor);
+    %RenameCtor(DragString, wxGenericDragImage(const wxString& str,
+                                          const wxCursor& cursor = wxNullCursor));

 
 

-    %name(DragTreeItem)wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
+    %RenameCtor(DragTreeItem, wxGenericDragImage(const wxPyTreeCtrl& treeCtrl, wxTreeItemId& id));

 
 

-    %name(DragListItem)wxGenericDragImage(const wxListCtrl& listCtrl, long id);
+    %RenameCtor(DragListItem, wxGenericDragImage(const wxPyListCtrl& listCtrl, long id));

 
     ~wxGenericDragImage();
 
 
     ~wxGenericDragImage();
 


@@ -50,13 +53,13 @@ public:
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,

-                   bool fullScreen = FALSE, wxRect* rect = NULL);
+                   bool fullScreen = false, wxRect* rect = NULL);

 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
     // position of the window on the screen, to restrict the drag to.
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
     // position of the window on the screen, to restrict the drag to.

-    %name(BeginDragBounded) bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
-                                           wxWindow* boundingWindow);
+    %Rename(BeginDragBounded,  bool, BeginDrag(const wxPoint& hotspot, wxWindow* window,
+                                           wxWindow* boundingWindow));

 
 
     // End drag
 
 
     // End drag


@@ -92,6 +95,8 @@ public:
 
     // Erase and redraw simultaneously if possible
     virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew);
 
     // Erase and redraw simultaneously if possible
     virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew);

+
+    %property(ImageRect, GetImageRect, doc="See `GetImageRect`");

 };
 
 
 };