Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.

Various cleanup, tweaks, minor additions, etc. to maintain compatibility with the current wxWindows. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-01-30 08:17:27 +00:00
parent 0812732316
commit dd9a3de816
17 changed files with 2324 additions and 58 deletions
--- a/utils/wxPython/src/gtk/controls2.cpp
+++ b/utils/wxPython/src/gtk/controls2.cpp
@@ -2606,6 +2606,38 @@ static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) {
    return _resultobj;
 }

+#define wxTreeCtrl_SetItemHasChildren(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemHasChildren(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxTreeCtrl_SetItemHasChildren(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxTreeCtrl * _arg0;
+    wxTreeItemId * _arg1;
+    bool  _arg2 = (1);
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    int tempbool2;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetItemHasChildren",&_argc0,&_argc1,&tempbool2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeCtrl_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemHasChildren. Expected _wxTreeItemId_p.");
+        return NULL;
+        }
+    }
+    _arg2 = (bool ) tempbool2;
+    wxTreeCtrl_SetItemHasChildren(_arg0,*_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxTreeCtrl_IsVisible(_swigobj,_swigarg0)  (_swigobj->IsVisible(_swigarg0))
 static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
@@ -3277,6 +3309,35 @@ static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args) {
    return _resultobj;
 }

+#define wxTreeCtrl_DeleteChildren(_swigobj,_swigarg0)  (_swigobj->DeleteChildren(_swigarg0))
+static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxTreeCtrl * _arg0;
+    wxTreeItemId * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_DeleteChildren",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_DeleteChildren. Expected _wxTreeCtrl_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_DeleteChildren. Expected _wxTreeItemId_p.");
+        return NULL;
+        }
+    }
+    wxTreeCtrl_DeleteChildren(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxTreeCtrl_DeleteAllItems(_swigobj)  (_swigobj->DeleteAllItems())
 static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
@@ -3716,6 +3777,7 @@ static PyMethodDef controls2cMethods[] = {
 	 { "wxTreeCtrl_Collapse", _wrap_wxTreeCtrl_Collapse, 1 },
 	 { "wxTreeCtrl_Expand", _wrap_wxTreeCtrl_Expand, 1 },
 	 { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, 1 },
+	 { "wxTreeCtrl_DeleteChildren", _wrap_wxTreeCtrl_DeleteChildren, 1 },
 	 { "wxTreeCtrl_Delete", _wrap_wxTreeCtrl_Delete, 1 },
 	 { "wxTreeCtrl_AppendItem", _wrap_wxTreeCtrl_AppendItem, 1 },
 	 { "wxTreeCtrl_InsertItem", _wrap_wxTreeCtrl_InsertItem, 1 },
@@ -3735,6 +3797,7 @@ static PyMethodDef controls2cMethods[] = {
 	 { "wxTreeCtrl_IsExpanded", _wrap_wxTreeCtrl_IsExpanded, 1 },
 	 { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, 1 },
 	 { "wxTreeCtrl_IsVisible", _wrap_wxTreeCtrl_IsVisible, 1 },
+	 { "wxTreeCtrl_SetItemHasChildren", _wrap_wxTreeCtrl_SetItemHasChildren, 1 },
 	 { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, 1 },
 	 { "wxTreeCtrl_SetItemSelectedImage", _wrap_wxTreeCtrl_SetItemSelectedImage, 1 },
 	 { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, 1 },
--- a/utils/wxPython/src/gtk/controls2.py
+++ b/utils/wxPython/src/gtk/controls2.py
@@ -427,6 +427,9 @@ class wxTreeCtrlPtr(wxControlPtr):
    def SetItemData(self,arg0,arg1):
        val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)
        return val
+    def SetItemHasChildren(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+        return val
    def IsVisible(self,arg0):
        val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)
        return val
@@ -524,6 +527,9 @@ class wxTreeCtrlPtr(wxControlPtr):
    def Delete(self,arg0):
        val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this)
        return val
+    def DeleteChildren(self,arg0):
+        val = controls2c.wxTreeCtrl_DeleteChildren(self.this,arg0.this)
+        return val
    def DeleteAllItems(self):
        val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)
        return val
--- a/utils/wxPython/src/gtk/frames.cpp
+++ b/utils/wxPython/src/gtk/frames.cpp
@@ -847,6 +847,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -855,6 +856,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
 	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
 	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
+	 SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
 	 SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -917,6 +919,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_signed_short","_short",0);
 	 SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
 	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
+	 SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
 	 SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
 	 SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
 	 SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -984,6 +987,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
--- a/utils/wxPython/src/gtk/gdi.cpp
+++ b/utils/wxPython/src/gtk/gdi.cpp
@@ -56,7 +56,7 @@ extern PyObject *SWIG_newvarlink(void);
 #include "helpers.h"
 #include <wx/metafile.h>
 #ifndef __WXMSW__
-#include <wx/postscrp.h>
+#include <wx/dcps.h>
 #endif

 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
@@ -1678,27 +1678,6 @@ static PyObject *_wrap_wxFont_GetFamily(PyObject *self, PyObject *args) {
    return _resultobj;
 }

-#define wxFont_GetFontId(_swigobj)  (_swigobj->GetFontId())
-static PyObject *_wrap_wxFont_GetFontId(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    int  _result;
-    wxFont * _arg0;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxFont_GetFontId",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxFont_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_GetFontId. Expected _wxFont_p.");
-        return NULL;
-        }
-    }
-    _result = (int )wxFont_GetFontId(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
 #define wxFont_GetPointSize(_swigobj)  (_swigobj->GetPointSize())
 static PyObject *_wrap_wxFont_GetPointSize(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
@@ -4951,7 +4930,6 @@ static PyMethodDef gdicMethods[] = {
 	 { "wxFont_GetUnderlined", _wrap_wxFont_GetUnderlined, 1 },
 	 { "wxFont_GetStyle", _wrap_wxFont_GetStyle, 1 },
 	 { "wxFont_GetPointSize", _wrap_wxFont_GetPointSize, 1 },
-	 { "wxFont_GetFontId", _wrap_wxFont_GetFontId, 1 },
 	 { "wxFont_GetFamily", _wrap_wxFont_GetFamily, 1 },
 	 { "wxFont_GetFaceName", _wrap_wxFont_GetFaceName, 1 },
 	 { "new_wxFont", _wrap_new_wxFont, 1 },
--- a/utils/wxPython/src/gtk/gdi.py
+++ b/utils/wxPython/src/gtk/gdi.py
@@ -147,9 +147,6 @@ class wxFontPtr :
    def GetFamily(self):
        val = gdic.wxFont_GetFamily(self.this)
        return val
-    def GetFontId(self):
-        val = gdic.wxFont_GetFontId(self.this)
-        return val
    def GetPointSize(self):
        val = gdic.wxFont_GetPointSize(self.this)
        return val
--- a/utils/wxPython/src/gtk/mdi.cpp
+++ b/utils/wxPython/src/gtk/mdi.cpp
@@ -775,6 +775,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_uint","_int",0);
 	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
 	 SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
+	 SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -783,6 +784,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
 	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
 	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
+	 SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
 	 SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -851,6 +853,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_signed_short","_short",0);
 	 SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
 	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
+	 SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
 	 SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
 	 SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
 	 SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -921,6 +924,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
 	 SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
 	 SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
--- a/utils/wxPython/src/gtk/misc.cpp
+++ b/utils/wxPython/src/gtk/misc.cpp
@@ -123,7 +123,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
    }
 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
-    char * _result;
+    wxString * _result;
    char * _arg0;
    char * _arg1 = NULL;
    char * _arg2 = NULL;
@@ -144,8 +144,13 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
        return NULL;
        }
    }
-    _result = (char *)wxFileSelector(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8);
-    _resultobj = Py_BuildValue("s", _result);
+    _result = new wxString (wxFileSelector(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;
+}
    return _resultobj;
 }

--- a/utils/wxPython/src/gtk/stattool.cpp
+++ b/utils/wxPython/src/gtk/stattool.cpp
@@ -885,6 +885,70 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
    return _resultobj;
 }

+static wxToolBarTool * wxToolBar_AddSimpleTool(wxToolBar *self,int  toolIndex,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString) {
+            return self->AddTool(toolIndex, bitmap, wxNullBitmap,
+                                 FALSE, -1, -1, NULL,
+                                 shortHelpString, longHelpString);
+        }
+static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolBarTool * _result;
+    wxToolBar * _arg0;
+    int  _arg1;
+    wxBitmap * _arg2;
+    wxString * _arg3 = &wxPyEmptyStr;
+    wxString * _arg4 = &wxPyEmptyStr;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    PyObject * _obj3 = 0;
+    PyObject * _obj4 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sis|OO:wxToolBar_AddSimpleTool",&_argc0,&_arg1,&_argc2,&_obj3,&_obj4)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSimpleTool. Expected _wxToolBar_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddSimpleTool. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_obj3)
+{
+    if (!PyString_Check(_obj3)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg3 = new wxString(PyString_AsString(_obj3));
+}
+    if (_obj4)
+{
+    if (!PyString_Check(_obj4)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg4 = new wxString(PyString_AsString(_obj4));
+}
+    _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    if (_obj3)
+        delete _arg3;
+}
+{
+    if (_obj4)
+        delete _arg4;
+}
+    return _resultobj;
+}
+
 #define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
@@ -1254,6 +1318,7 @@ static PyMethodDef stattoolcMethods[] = {
 	 { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, 1 },
 	 { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, 1 },
 	 { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, 1 },
+	 { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, 1 },
 	 { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, 1 },
 	 { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 },
 	 { "new_wxToolBar", _wrap_new_wxToolBar, 1 },
--- a/utils/wxPython/src/gtk/stattool.py
+++ b/utils/wxPython/src/gtk/stattool.py
@@ -157,6 +157,10 @@ class wxToolBarPtr(wxControlPtr):
        val = apply(stattoolc.wxToolBar_AddTool,(self.this,arg0,arg1.this,)+args)
        val = wxToolBarToolPtr(val)
        return val
+    def AddSimpleTool(self,arg0,arg1,*args):
+        val = apply(stattoolc.wxToolBar_AddSimpleTool,(self.this,arg0,arg1.this,)+args)
+        val = wxToolBarToolPtr(val)
+        return val
    def EnableTool(self,arg0,arg1):
        val = stattoolc.wxToolBar_EnableTool(self.this,arg0,arg1)
        return val
--- a/utils/wxPython/src/gtk/windows2.cpp
+++ b/utils/wxPython/src/gtk/windows2.cpp
@@ -2843,7 +2843,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
    wxWindowID  _arg1;
    wxPoint * _arg2 = &wxPyDefaultPosition;
    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxSP_3D)|wxCLIP_CHILDREN;
+    long  _arg4 = (wxSP_3D)|(wxCLIP_CHILDREN);
    char * _arg5 = "splitterWindow";
    char * _argc0 = 0;
    char * _argc2 = 0;
--- a/utils/wxPython/src/gtk/windows3.cpp
+++ b/utils/wxPython/src/gtk/windows3.cpp
--- a/utils/wxPython/src/gtk/windows3.py
+++ b/utils/wxPython/src/gtk/windows3.py
@@ -0,0 +1,293 @@
+# This file was created automatically by SWIG.
+import windows3c
+
+from misc import *
+
+from gdi import *
+
+from windows import *
+
+from windows2 import *
+
+from controls import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+import wx
+class wxSashEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetEdge(self,arg0):
+        val = windows3c.wxSashEvent_SetEdge(self.this,arg0)
+        return val
+    def GetEdge(self):
+        val = windows3c.wxSashEvent_GetEdge(self.this)
+        return val
+    def SetDragRect(self,arg0):
+        val = windows3c.wxSashEvent_SetDragRect(self.this,arg0.this)
+        return val
+    def GetDragRect(self):
+        val = windows3c.wxSashEvent_GetDragRect(self.this)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
+    def SetDragStatus(self,arg0):
+        val = windows3c.wxSashEvent_SetDragStatus(self.this,arg0)
+        return val
+    def GetDragStatus(self):
+        val = windows3c.wxSashEvent_GetDragStatus(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxSashEvent instance>"
+class wxSashEvent(wxSashEventPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxSashWindowPtr(wxWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetSashVisible(self,arg0):
+        val = windows3c.wxSashWindow_GetSashVisible(self.this,arg0)
+        return val
+    def GetDefaultBorderSize(self):
+        val = windows3c.wxSashWindow_GetDefaultBorderSize(self.this)
+        return val
+    def GetEdgeMargin(self,arg0):
+        val = windows3c.wxSashWindow_GetEdgeMargin(self.this,arg0)
+        return val
+    def GetExtraBorderSize(self):
+        val = windows3c.wxSashWindow_GetExtraBorderSize(self.this)
+        return val
+    def GetMaximumSizeX(self):
+        val = windows3c.wxSashWindow_GetMaximumSizeX(self.this)
+        return val
+    def GetMaximumSizeY(self):
+        val = windows3c.wxSashWindow_GetMaximumSizeY(self.this)
+        return val
+    def GetMinimumSizeX(self):
+        val = windows3c.wxSashWindow_GetMinimumSizeX(self.this)
+        return val
+    def GetMinimumSizeY(self):
+        val = windows3c.wxSashWindow_GetMinimumSizeY(self.this)
+        return val
+    def HasBorder(self,arg0):
+        val = windows3c.wxSashWindow_HasBorder(self.this,arg0)
+        return val
+    def SetDefaultBorderSize(self,arg0):
+        val = windows3c.wxSashWindow_SetDefaultBorderSize(self.this,arg0)
+        return val
+    def SetExtraBorderSize(self,arg0):
+        val = windows3c.wxSashWindow_SetExtraBorderSize(self.this,arg0)
+        return val
+    def SetMaximumSizeX(self,arg0):
+        val = windows3c.wxSashWindow_SetMaximumSizeX(self.this,arg0)
+        return val
+    def SetMaximumSizeY(self,arg0):
+        val = windows3c.wxSashWindow_SetMaximumSizeY(self.this,arg0)
+        return val
+    def SetMinimumSizeX(self,arg0):
+        val = windows3c.wxSashWindow_SetMinimumSizeX(self.this,arg0)
+        return val
+    def SetMinimumSizeY(self,arg0):
+        val = windows3c.wxSashWindow_SetMinimumSizeY(self.this,arg0)
+        return val
+    def SetSashVisible(self,arg0,arg1):
+        val = windows3c.wxSashWindow_SetSashVisible(self.this,arg0,arg1)
+        return val
+    def SetSashBorder(self,arg0,arg1):
+        val = windows3c.wxSashWindow_SetSashBorder(self.this,arg0,arg1)
+        return val
+    def __repr__(self):
+        return "<C wxSashWindow instance>"
+class wxSashWindow(wxSashWindowPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(windows3c.new_wxSashWindow,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)
+
+
+
+
+class wxQueryLayoutInfoEventPtr(wxEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetRequestedLength(self,arg0):
+        val = windows3c.wxQueryLayoutInfoEvent_SetRequestedLength(self.this,arg0)
+        return val
+    def GetRequestedLength(self):
+        val = windows3c.wxQueryLayoutInfoEvent_GetRequestedLength(self.this)
+        return val
+    def SetFlags(self,arg0):
+        val = windows3c.wxQueryLayoutInfoEvent_SetFlags(self.this,arg0)
+        return val
+    def GetFlags(self):
+        val = windows3c.wxQueryLayoutInfoEvent_GetFlags(self.this)
+        return val
+    def SetSize(self,arg0):
+        val = windows3c.wxQueryLayoutInfoEvent_SetSize(self.this,arg0.this)
+        return val
+    def GetSize(self):
+        val = windows3c.wxQueryLayoutInfoEvent_GetSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
+    def SetOrientation(self,arg0):
+        val = windows3c.wxQueryLayoutInfoEvent_SetOrientation(self.this,arg0)
+        return val
+    def GetOrientation(self):
+        val = windows3c.wxQueryLayoutInfoEvent_GetOrientation(self.this)
+        return val
+    def SetAlignment(self,arg0):
+        val = windows3c.wxQueryLayoutInfoEvent_SetAlignment(self.this,arg0)
+        return val
+    def GetAlignment(self):
+        val = windows3c.wxQueryLayoutInfoEvent_GetAlignment(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxQueryLayoutInfoEvent instance>"
+class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxCalculateLayoutEventPtr(wxEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetFlags(self,arg0):
+        val = windows3c.wxCalculateLayoutEvent_SetFlags(self.this,arg0)
+        return val
+    def GetFlags(self):
+        val = windows3c.wxCalculateLayoutEvent_GetFlags(self.this)
+        return val
+    def SetRect(self,arg0):
+        val = windows3c.wxCalculateLayoutEvent_SetRect(self.this,arg0.this)
+        return val
+    def GetRect(self):
+        val = windows3c.wxCalculateLayoutEvent_GetRect(self.this)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
+    def __repr__(self):
+        return "<C wxCalculateLayoutEvent instance>"
+class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxSashLayoutWindowPtr(wxSashWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetAlignment(self):
+        val = windows3c.wxSashLayoutWindow_GetAlignment(self.this)
+        return val
+    def GetOrientation(self):
+        val = windows3c.wxSashLayoutWindow_GetOrientation(self.this)
+        return val
+    def SetAlignment(self,arg0):
+        val = windows3c.wxSashLayoutWindow_SetAlignment(self.this,arg0)
+        return val
+    def SetDefaultSize(self,arg0):
+        val = windows3c.wxSashLayoutWindow_SetDefaultSize(self.this,arg0.this)
+        return val
+    def SetOrientation(self,arg0):
+        val = windows3c.wxSashLayoutWindow_SetOrientation(self.this,arg0)
+        return val
+    def __repr__(self):
+        return "<C wxSashLayoutWindow instance>"
+class wxSashLayoutWindow(wxSashLayoutWindowPtr):
+    def __init__(self,arg0,arg1,*args) :
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        try: argl[1] = argl[1].this
+        except: pass
+        args = tuple(argl)
+        self.this = apply(windows3c.new_wxSashLayoutWindow,(arg0.this,arg1,)+args)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)
+        wx._checkForCallback(self, 'OnCalculateLayout',    wxEVT_CALCULATE_LAYOUT)
+        wx._checkForCallback(self, 'OnQueryLayoutInfo',    wxEVT_QUERY_LAYOUT_INFO)
+
+
+
+
+class wxLayoutAlgorithmPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            windows3c.delete_wxLayoutAlgorithm(self.this)
+    def LayoutMDIFrame(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self.this,arg0.this,)+args)
+        return val
+    def LayoutFrame(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self.this,arg0.this,)+args)
+        return val
+    def __repr__(self):
+        return "<C wxLayoutAlgorithm instance>"
+class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):
+    def __init__(self) :
+        self.this = windows3c.new_wxLayoutAlgorithm()
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+wxSASH_TOP = windows3c.wxSASH_TOP
+wxSASH_RIGHT = windows3c.wxSASH_RIGHT
+wxSASH_BOTTOM = windows3c.wxSASH_BOTTOM
+wxSASH_LEFT = windows3c.wxSASH_LEFT
+wxSASH_NONE = windows3c.wxSASH_NONE
+wxEVT_SASH_DRAGGED = windows3c.wxEVT_SASH_DRAGGED
+wxSW_3D = windows3c.wxSW_3D
+wxSASH_STATUS_OK = windows3c.wxSASH_STATUS_OK
+wxSASH_STATUS_OUT_OF_RANGE = windows3c.wxSASH_STATUS_OUT_OF_RANGE
+wxLAYOUT_HORIZONTAL = windows3c.wxLAYOUT_HORIZONTAL
+wxLAYOUT_VERTICAL = windows3c.wxLAYOUT_VERTICAL
+wxLAYOUT_NONE = windows3c.wxLAYOUT_NONE
+wxLAYOUT_TOP = windows3c.wxLAYOUT_TOP
+wxLAYOUT_LEFT = windows3c.wxLAYOUT_LEFT
+wxLAYOUT_RIGHT = windows3c.wxLAYOUT_RIGHT
+wxLAYOUT_BOTTOM = windows3c.wxLAYOUT_BOTTOM
+wxEVT_QUERY_LAYOUT_INFO = windows3c.wxEVT_QUERY_LAYOUT_INFO
+wxEVT_CALCULATE_LAYOUT = windows3c.wxEVT_CALCULATE_LAYOUT
--- a/utils/wxPython/src/gtk/wx.cpp
+++ b/utils/wxPython/src/gtk/wx.cpp
@@ -33,16 +33,11 @@
 * and things like that.
 *
 * $Log$
- * Revision 1.4  1999/01/14 14:33:39  VZ
- * 1. NOT_FOUND -> wxNOT_FOUND
- * 2. wxString::Left(), Right(), Before(), After() clean up
- * 3. wxLocale updates
+ * Revision 1.5  1999/01/30 08:14:59  RD
+ * Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 *
- * Revision 1.3  1998/12/17 17:53:31  RD
- *
- * wxPython 0.5.2
- * Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
- * versions are much closer now!
+ * Various cleanup, tweaks, minor additions, etc. to maintain
+ * compatibility with the current wxWindows.
 *
 ************************************************************************/

@@ -638,6 +633,8 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 extern "C" SWIGEXPORT(void,initstattoolc)();
 extern "C" SWIGEXPORT(void,initframesc)();
 extern "C" SWIGEXPORT(void,initutilsc)();
+extern "C" SWIGEXPORT(void,initwindows3c)();
+

 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {

@@ -1178,7 +1175,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long) wxMAJOR_VERSION));
 	 PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long) wxMINOR_VERSION));
 	 PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long) wxRELEASE_NUMBER));
-	 PyDict_SetItemString(d,"wxNOT_FOUND", PyInt_FromLong((long) NOT_FOUND));
+	 PyDict_SetItemString(d,"wxNOT_FOUND", PyInt_FromLong((long) wxNOT_FOUND));
 	 PyDict_SetItemString(d,"wxVSCROLL", PyInt_FromLong((long) wxVSCROLL));
 	 PyDict_SetItemString(d,"wxHSCROLL", PyInt_FromLong((long) wxHSCROLL));
 	 PyDict_SetItemString(d,"wxCAPTION", PyInt_FromLong((long) wxCAPTION));
@@ -1214,6 +1211,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxDEFAULT_FRAME_STYLE", PyInt_FromLong((long) wxDEFAULT_FRAME_STYLE));
 	 PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE));
 	 PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW));
+	 PyDict_SetItemString(d,"wxCLIP_CHILDREN", PyInt_FromLong((long) wxCLIP_CHILDREN));
 	 PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED));
 	 PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE));
 	 PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
@@ -1322,12 +1320,6 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxSIZE_AUTO", PyInt_FromLong((long) wxSIZE_AUTO));
 	 PyDict_SetItemString(d,"wxSIZE_USE_EXISTING", PyInt_FromLong((long) wxSIZE_USE_EXISTING));
 	 PyDict_SetItemString(d,"wxSIZE_ALLOW_MINUS_ONE", PyInt_FromLong((long) wxSIZE_ALLOW_MINUS_ONE));
-	 PyDict_SetItemString(d,"wxDF_TEXT", PyInt_FromLong((long) wxDF_TEXT));
-	 PyDict_SetItemString(d,"wxDF_BITMAP", PyInt_FromLong((long) wxDF_BITMAP));
-	 PyDict_SetItemString(d,"wxDF_METAFILE", PyInt_FromLong((long) wxDF_METAFILE));
-	 PyDict_SetItemString(d,"wxDF_DIB", PyInt_FromLong((long) wxDF_DIB));
-	 PyDict_SetItemString(d,"wxDF_OEMTEXT", PyInt_FromLong((long) wxDF_OEMTEXT));
-	 PyDict_SetItemString(d,"wxDF_FILENAME", PyInt_FromLong((long) wxDF_FILENAME));
 	 PyDict_SetItemString(d,"wxPORTRAIT", PyInt_FromLong((long) wxPORTRAIT));
 	 PyDict_SetItemString(d,"wxLANDSCAPE", PyInt_FromLong((long) wxLANDSCAPE));
 	 PyDict_SetItemString(d,"wxID_OPEN", PyInt_FromLong((long) wxID_OPEN));
@@ -1685,7 +1677,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-	 PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.2"));
+	 PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.3"));
 	 PyDict_SetItemString(d,"cvar", SWIG_globals);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
@@ -1709,6 +1701,7 @@ SWIGEXPORT(void,initwxc)() {
    initcmndlgsc();
    initstattoolc();
    initframesc();
+    initwindows3c();
 #ifndef SEPARATE
    initutilsc();
 #endif
@@ -1748,12 +1741,15 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_long","_signed_long",0);
 	 SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
 	 SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
+	 SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
 	 SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
+	 SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0);
 	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
 	 SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
 	 SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
 	 SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
+	 SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0);
 	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
 	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
 	 SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
@@ -1774,9 +1770,11 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
 	 SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
+	 SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
 	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
 	 SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
+	 SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0);
 	 SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
 	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
 	 SWIG_RegisterMapping("_uint","_int",0);
@@ -1788,6 +1786,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
 	 SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
+	 SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0);
 	 SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
 	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
 	 SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0);
@@ -1811,6 +1810,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
 	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
 	 SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
+	 SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
 	 SWIG_RegisterMapping("_EBool","_signed_int",0);
 	 SWIG_RegisterMapping("_EBool","_int",0);
 	 SWIG_RegisterMapping("_EBool","_wxWindowID",0);
@@ -1861,6 +1861,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
 	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
+	 SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0);
 	 SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
 	 SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
 	 SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
@@ -1898,14 +1899,17 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
 	 SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
 	 SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
+	 SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0);
 	 SWIG_RegisterMapping("_short","_WXTYPE",0);
 	 SWIG_RegisterMapping("_short","_unsigned_short",0);
 	 SWIG_RegisterMapping("_short","_signed_short",0);
 	 SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
+	 SWIG_RegisterMapping("_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0);
 	 SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
 	 SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
 	 SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
 	 SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
+	 SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
@@ -1983,6 +1987,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
 	 SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
 	 SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
+	 SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0);
 	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
 	 SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
 	 SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
--- a/utils/wxPython/src/gtk/wx.py
+++ b/utils/wxPython/src/gtk/wx.py
@@ -23,6 +23,8 @@ from windows2 import *

 from cmndlgs import *

+from windows3 import *
+
 from utils import *
 class wxPyAppPtr(wxEvtHandlerPtr):
    def __init__(self,this):
@@ -108,7 +110,7 @@ _wxSetDictionary = wxc._wxSetDictionary
 wxMAJOR_VERSION = wxc.wxMAJOR_VERSION
 wxMINOR_VERSION = wxc.wxMINOR_VERSION
 wxRELEASE_NUMBER = wxc.wxRELEASE_NUMBER
-NOT_FOUND = wxc.NOT_FOUND
+wxNOT_FOUND = wxc.wxNOT_FOUND
 wxVSCROLL = wxc.wxVSCROLL
 wxHSCROLL = wxc.wxHSCROLL
 wxCAPTION = wxc.wxCAPTION
@@ -144,6 +146,7 @@ wxDIALOG_MODELESS = wxc.wxDIALOG_MODELESS
 wxDEFAULT_FRAME_STYLE = wxc.wxDEFAULT_FRAME_STYLE
 wxDEFAULT_DIALOG_STYLE = wxc.wxDEFAULT_DIALOG_STYLE
 wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW
+wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN
 wxRETAINED = wxc.wxRETAINED
 wxBACKINGSTORE = wxc.wxBACKINGSTORE
 wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
@@ -252,12 +255,6 @@ wxSIZE_AUTO_HEIGHT = wxc.wxSIZE_AUTO_HEIGHT
 wxSIZE_AUTO = wxc.wxSIZE_AUTO
 wxSIZE_USE_EXISTING = wxc.wxSIZE_USE_EXISTING
 wxSIZE_ALLOW_MINUS_ONE = wxc.wxSIZE_ALLOW_MINUS_ONE
-wxDF_TEXT = wxc.wxDF_TEXT
-wxDF_BITMAP = wxc.wxDF_BITMAP
-wxDF_METAFILE = wxc.wxDF_METAFILE
-wxDF_DIB = wxc.wxDF_DIB
-wxDF_OEMTEXT = wxc.wxDF_OEMTEXT
-wxDF_FILENAME = wxc.wxDF_FILENAME
 wxPORTRAIT = wxc.wxPORTRAIT
 wxLANDSCAPE = wxc.wxLANDSCAPE
 wxID_OPEN = wxc.wxID_OPEN
@@ -1087,6 +1084,20 @@ def EVT_GRID_LABEL_RCLICK(win, fn):
    win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)


+# wxSashWindow
+def EVT_SASH_DRAGGED(win, id, func):
+    win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
+
+def EVT_SASH_DRAGGED_RANGE(win, id1, id2, func):
+    win.Connect(id1, id2, wxEVT_SASH_DRAGGED, func)
+
+def EVT_QUERY_LAYOUT_INFO(win, func):
+    win.Connect(-1, -1, wxEVT_EVT_QUERY_LAYOUT_INFO, func)
+
+def EVT_CALCULATE_LAYOUT(win, func):
+    win.Connect(-1, -1, wxEVT_EVT_CALCULATE_LAYOUT, func)
+
+


 #----------------------------------------------------------------------
@@ -1116,6 +1127,10 @@ wxNamedColor = wxNamedColour
 wxPyDefaultPosition.Set(-1,-1)
 wxPyDefaultSize.Set(-1,-1)

+# aliases so that C++ documentation applies:
+wxDefaultPosition = wxPyDefaultPosition
+wxDefaultSize     = wxPyDefaultSize
+
 #----------------------------------------------------------------------

 ## class wxPyStdOutWindow(wxFrame):
@@ -1183,10 +1198,22 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.3  1998/12/17 17:53:33  RD
-# wxPython 0.5.2
-# Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
-# versions are much closer now!
+# Revision 1.4  1999/01/30 08:15:02  RD
+# Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+#
+# Various cleanup, tweaks, minor additions, etc. to maintain
+# compatibility with the current wxWindows.
+#
+# Revision 1.9  1999/01/30 07:30:09  RD
+#
+# Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+#
+# Various cleanup, tweaks, minor additions, etc. to maintain
+# compatibility with the current wxWindows.
+#
+# Revision 1.8  1999/01/29 21:13:42  HH
+# Added aliases for wxDefaultPosition and wxDefaultSize (from wxPy..) in _extras,
+# so that C++ documentation applies.
 #
 # Revision 1.7  1998/11/25 08:45:21  RD
 #