Did splitting of wxEntry for wxMSW. Not nearly as complex as wxGTK

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

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 91964d7a5f51d4fb80f2d59416d6aaf29d954ab3..6894912fd53dbb6a017c827ed1bab7864ce8f6d4 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -324,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;
@@ -362,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);
+    }
+%}
 
 
 //---------------------------------------------------------------------------
@@ -447,6 +468,7 @@ public:
                        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);
@@ -559,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);