Bug fix

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index a79cea8664eb6b940f698c4ba032ac813505a7f7..630252fd01f7e1d2e340a60b7e2edcc03cde0bc2 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -87,7 +87,7 @@ public:
 
     %addmethods {
         void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyClientData(_self));
+            self->SetClientObject(new wxPyOORClientData(_self));
         }
     }
 };
@@ -195,7 +195,6 @@ public:
     %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
 
 
-    void CaptureMouse();
     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );
@@ -217,9 +216,11 @@ public:
     void DragAcceptFiles(bool accept);
 #endif
     void Enable(bool enable);
-    //bool FakePopupMenu(wxMenu* menu, int x, int y);
+
+    // Find child window by ID or name
     %name(FindWindowById) wxWindow* FindWindow(long id);
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
+
     void Fit();
     wxColour GetBackgroundColour();
     wxBorder GetBorder() const;
@@ -313,7 +314,7 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 
-    void ReleaseMouse();
+    void AddChild(wxWindow* child);
     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
@@ -328,6 +329,7 @@ public:
     void SetConstraints(wxLayoutConstraints *constraints);
     void UnsetConstraints(wxLayoutConstraints *constraints);
     void SetFocus();
+    void SetFocusFromKbd();
     bool AcceptsFocus();
     void SetFont(const wxFont& font);
     void SetForegroundColour(const wxColour& colour);
@@ -351,11 +353,23 @@ public:
         }
     }
 
-    void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
+    void SetSizeHints(int minW,    int minH,
+                      int maxW=-1, int maxH=-1,
+                      int incW=-1, int incH=-1);
+    void SetVirtualSizeHints( int minW, int minH,
+                              int maxW = -1, int maxH = -1 );
+
+    void SetVirtualSize( const wxSize &size );
+    %name(SetVirtualSizeWH)void SetVirtualSize( int x, int y );
+
+    wxSize GetVirtualSize() const;
+    %name(GetVirtualSizeTuple)void GetVirtualSize( int *OUTPUT, int *OUTPUT ) const;
+
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);
-    void SetCursor(const wxCursor& cursor);
+    bool SetCursor(const wxCursor& cursor);
+    wxCursor& GetCursor();
     void SetEventHandler(wxEvtHandler* handler);
     void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);
@@ -364,7 +378,6 @@ public:
     bool TransferDataToWindow();
     void UpdateWindowUI();
     bool Validate();
-    void WarpPointer(int x, int y);
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
@@ -380,6 +393,7 @@ public:
     wxToolTip* GetToolTip();
 
     void SetSizer(wxSizer* sizer, bool deleteOld=TRUE);
+    void SetSizerAndFit(wxSizer *sizer, bool deleteOld=TRUE);
     wxSizer* GetSizer();
 
         // Track if this window is a member of a sizer
@@ -389,11 +403,9 @@ public:
     wxValidator* GetValidator();
     void SetValidator(const wxValidator& validator);
 
-#ifndef __WXMAC__
     void SetDropTarget(wxDropTarget* target);
     wxDropTarget* GetDropTarget();
     %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
-#endif
 
     wxSize GetBestSize();
     wxSize GetMaxSize();
@@ -438,6 +450,23 @@ public:
 
     wxWindow* GetDefaultItem();
     wxWindow* SetDefaultItem(wxWindow *btn);
+    void SetTmpDefaultItem(wxWindow *win);
+
+    // move the mouse to the specified position
+    void WarpPointer(int x, int y);
+
+    // start or end mouse capture, these functions maintain the stack of
+    // windows having captured the mouse and after calling ReleaseMouse()
+    // the mouse is not released but returns to the window which had had
+    // captured it previously (if any)
+    void CaptureMouse();
+    void ReleaseMouse();
+
+    // get the window which currently captures the mouse or NULL
+    static wxWindow *GetCapture();
+
+    // does this window have the capture?
+    bool HasCapture() const;
 };
 
 
@@ -470,6 +499,27 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #endif
 
 
+// Unfortunatly the names of these new static methods clash with the
+// names wxPython has been using forever for the overloaded
+// wxWindow::FindWindow, so instead of swigging them as statics create
+// standalone functions for them.
+%inline %{
+wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
+    return wxWindow::FindWindowById(id, parent);
+}
+
+wxWindow* wxFindWindowByName( const wxString& name,
+                              const wxWindow *parent = NULL ) {
+     return wxWindow::FindWindowByName(name, parent);
+}
+
+wxWindow* wxFindWindowByLabel( const wxString& label,
+                               const wxWindow *parent = NULL ) {
+    return wxWindow::FindWindowByLabel(label, parent);
+}
+%}
+
+
 //---------------------------------------------------------------------------
 
 class wxPanel : public wxWindow {
@@ -527,7 +577,6 @@ public:
     int GetScrollPageSize(int orient);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     wxWindow* GetTargetWindow();
-    void GetVirtualSize(int* OUTPUT, int* OUTPUT);
     bool IsRetained();
     void PrepareDC(wxDC& dc);
     void Scroll(int x, int y);
@@ -570,6 +619,10 @@ public:
     void AdjustScrollbars();
 
     bool Layout();
+
+    // Set the x, y scrolling increments.
+    void SetScrollRate( int xstep, int ystep );
+
 };
 
 //----------------------------------------------------------------------