small change to avoid floating point exception in wxScrolledWindow::Scroll

[wxWidgets.git] / utils / wxPython / src / windows.i

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index f9daf1d0095efab5d276659ec91417b6743fee55..3c21bff6bf2ea30b14e586926b2af8782275a4d1 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -207,7 +207,7 @@ public:
     wxWindow * GetGrandParent();
     %addmethods {
         long GetHandle() {
     wxWindow * GetGrandParent();
     %addmethods {
         long GetHandle() {

-            return (long)self->GetHandle();
+            return wxPyGetWinHandle(self); //(long)self->GetHandle();

         }
     }
     int GetId();
         }
     }
     int GetId();


@@ -233,6 +233,9 @@ public:
     bool Hide();
     void InitDialog();
     bool IsEnabled();
     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();
     bool IsRetained();
     bool IsShown();
     bool IsTopLevel();


@@ -252,6 +255,7 @@ public:
     void Raise();
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
     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)
     bool Reparent( wxWindow* newParent );
 
     // (uses apply'ed INOUT typemap, see above)


@@ -277,11 +281,11 @@ public:
     %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
     %addmethods {
         void SetSize(const wxSize& size) {
     %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) {
         }
 
         void SetPosition(const wxPoint& pos) {

-            self->SetSize(pos.x, pos.y, -1, -1);
+            self->Move(pos);

         }
     }
 
         }
     }
 


@@ -320,6 +324,16 @@ public:
     %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
 
     wxSize GetBestSize();
     %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;
 };
 
 //%clear int* x, int* y;


@@ -358,6 +372,17 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 %}
 #endif
 
 %}
 #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);
+    }
+%}

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -431,7 +456,9 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
 
     void EnableScrolling(bool xScrolling, bool yScrolling);
     %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
 
     void EnableScrolling(bool xScrolling, bool yScrolling);

+    int GetScrollPageSize(int orient);

     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);

+    wxWindow* GetTargetWindow();

     void GetVirtualSize(int* OUTPUT, int* OUTPUT);
     bool IsRetained();
     void PrepareDC(wxDC& dc);
     void GetVirtualSize(int* OUTPUT, int* OUTPUT);
     bool IsRetained();
     void PrepareDC(wxDC& dc);


@@ -439,6 +466,7 @@ public:
     void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                        int noUnitsX, int noUnitsY,
                        int xPos = 0, int yPos = 0);
     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 ViewStart(int* OUTPUT, int* OUTPUT);
 
     void SetTargetWindow(wxWindow* window);
     void ViewStart(int* OUTPUT, int* OUTPUT);