wxUniversal fixes:

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 61f45be466e08279e85642f91d2d1ca36cdde798..e1e0cae794516646ff7e727efc7a0ce19a598c8d 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -87,7 +87,7 @@ public:
 
     %addmethods {
         void _setOORInfo(PyObject* _self) {
 
     %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)"
 
 
     %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
 
 

-    void CaptureMouse();

     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );
     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );


@@ -313,7 +312,6 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 

-    void ReleaseMouse();

     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 


@@ -364,7 +362,6 @@ public:
     bool TransferDataToWindow();
     void UpdateWindowUI();
     bool Validate();
     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);
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);


@@ -438,6 +435,23 @@ public:
 
     wxWindow* GetDefaultItem();
     wxWindow* SetDefaultItem(wxWindow *btn);
 
     wxWindow* GetDefaultItem();
     wxWindow* SetDefaultItem(wxWindow *btn);

+
+
+    // 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;

 };
 
 
 };
 
 


@@ -583,7 +597,7 @@ public:
 
     void Append(int id, const wxString& item,
                 const wxString& helpString = wxPyEmptyString,
 
     void Append(int id, const wxString& item,
                 const wxString& helpString = wxPyEmptyString,

-                wxItemKind kind = wxItem_Normal);
+                wxItemKind kind = wxITEM_NORMAL);

     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                                  const wxString& helpString = wxPyEmptyString);
     %name(AppendItem)void Append(const wxMenuItem* item);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                                  const wxString& helpString = wxPyEmptyString);
     %name(AppendItem)void Append(const wxMenuItem* item);


@@ -600,7 +614,7 @@ public:
                 int id,
                 const wxString& text,
                 const wxString& help = wxPyEmptyString,
                 int id,
                 const wxString& text,
                 const wxString& help = wxPyEmptyString,

-                wxItemKind kind = wxItem_Normal);
+                wxItemKind kind = wxITEM_NORMAL);

     void InsertSeparator(size_t pos);
     void InsertCheckItem(size_t pos,
                          int id,
     void InsertSeparator(size_t pos);
     void InsertCheckItem(size_t pos,
                          int id,


@@ -621,7 +635,7 @@ public:
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxPyEmptyString,
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxPyEmptyString,

-                 wxItemKind kind = wxItem_Normal);
+                 wxItemKind kind = wxITEM_NORMAL);

     void PrependSeparator();
     void PrependCheckItem(int id,
                           const wxString& text,
     void PrependSeparator();
     void PrependCheckItem(int id,
                           const wxString& text,


@@ -734,7 +748,7 @@ public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,

-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu* subMenu = NULL);
 
 
                wxMenu* subMenu = NULL);