X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/694759cfeb701f8b96d720e72f760cc21e2e6b00..7ece89c6b10b74d90534afcffc61522a8f394d8c:/utils/wxPython/src/windows.i

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 6f913b7e2c..6894912fd5 100644
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -55,6 +55,14 @@ public:
                           new wxPyCallback(func));
             }
         }
+
+        bool Disconnect(int id, int lastId = -1,
+                        wxEventType eventType = wxEVT_NULL) {
+            return self->Disconnect(id, lastId, eventType,
+                                   (wxObjectEventFunction)
+                                    &wxPyCallback::EventThunker);
+        }
+
     }
 };
 
@@ -134,9 +142,7 @@ public:
     wxPyValidator();
 //    ~wxPyValidator();
 
-    %addmethods {
-        void Destroy() { delete self; }
-    }
+    %addmethods { void Destroy() { delete self; } }
 
     void _setSelf(PyObject* self, int incref=TRUE);
     %pragma(python) addtomethod = "__init__:self._setSelf(self, 0)"
@@ -201,7 +207,7 @@ public:
     wxWindow * GetGrandParent();
     %addmethods {
         long GetHandle() {
-            return (long)self->GetHandle();
+            return wxPyGetWinHandle(self); //(long)self->GetHandle();
         }
     }
     int GetId();
@@ -227,6 +233,9 @@ public:
     bool Hide();
     void InitDialog();
     bool IsEnabled();
+    bool IsExposed( int x, int y, int w=0, int h=0 );
+    %name(IsExposedPoint) bool IsExposed( const wxPoint& pt );
+    %name(IsExposedRect)  bool IsExposed( const wxRect& rect );
     bool IsRetained();
     bool IsShown();
     bool IsTopLevel();
@@ -246,6 +255,7 @@ public:
     void Raise();
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
+    void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
     // (uses apply'ed INOUT typemap, see above)
@@ -265,17 +275,17 @@ public:
     void SetForegroundColour(const wxColour& colour);
     void SetId(int id);
     void SetName(const wxString& name);
-    void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
+    void SetScrollbar(int orientation, int position, int thumbSize, int range, int refresh = TRUE);
     void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
 
     %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
     %addmethods {
         void SetSize(const wxSize& size) {
-            self->SetSize(size.x, size.y);
+            self->SetSize(size);
         }
 
         void SetPosition(const wxPoint& pos) {
-            self->SetSize(pos.x, pos.y, -1, -1);
+            self->Move(pos);
         }
     }
 
@@ -314,6 +324,16 @@ public:
     %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
 
     wxSize GetBestSize();
+
+    void SetCaret(wxCaret *caret);
+    wxCaret *GetCaret();
+    %pragma(python) addtoclass = "# replaces broken shadow method
+    def GetCaret(self, *_args, **_kwargs):
+        from misc2 import wxCaretPtr
+        val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+        if val: val = wxCaretPtr(val)
+        return val
+"
 };
 
 //%clear int* x, int* y;
@@ -352,6 +372,17 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 %}
 #endif
 
+%inline %{
+    int wxWindow_NewControlId() {
+        return wxWindow::NewControlId();
+    }
+    int wxWindow_NextControlId(int id) {
+        return wxWindow::NextControlId(id);
+    }
+    int wxWindow_PrevControlId(int id) {
+        return wxWindow::PrevControlId(id);
+    }
+%}
 
 
 //---------------------------------------------------------------------------
@@ -425,7 +456,9 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
 
     void EnableScrolling(bool xScrolling, bool yScrolling);
+    int GetScrollPageSize(int orient);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
+    wxWindow* GetTargetWindow();
     void GetVirtualSize(int* OUTPUT, int* OUTPUT);
     bool IsRetained();
     void PrepareDC(wxDC& dc);
@@ -433,6 +466,9 @@ public:
     void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                        int noUnitsX, int noUnitsY,
                        int xPos = 0, int yPos = 0);
+    void SetScrollPageSize(int orient, int pageSize);
+    void SetTargetWindow(wxWindow* window);
+    void GetViewStart(int* OUTPUT, int* OUTPUT);
     void ViewStart(int* OUTPUT, int* OUTPUT);
 
     void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
@@ -481,9 +517,7 @@ public:
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 
     %addmethods {
-        void Destroy() {
-            delete self;
-        }
+        void Destroy() { delete self; }
     }
     %name(DestroyId)bool Destroy(int id);
     %name(DestroyItem)bool Destroy(wxMenuItem *item);
@@ -547,7 +581,7 @@ public:
 
 class wxMenuItem {
 public:
-    wxMenuItem(wxMenu* parentMenu=NULL, int id=ID_SEPARATOR,
+    wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
                const wxString& text = wxPyEmptyStr,
                const wxString& help = wxPyEmptyStr,
                bool isCheckable = FALSE, wxMenu* subMenu = NULL);