diff --git a/wxPython/.cvsignore b/wxPython/.cvsignore
index 6e3d362030..6ccf93a8aa 100644
--- a/wxPython/.cvsignore
+++ b/wxPython/.cvsignore
@@ -12,6 +12,7 @@ build-gtk2-dbg.unicode
 build-gtk2.unicode
 build-pkg
 build-pkg-debug
+build-x11
 build.local
 build.unicode
 dist
diff --git a/wxPython/include/wx/wxPython/pyclasses.h b/wxPython/include/wx/wxPython/pyclasses.h
index c74f8cacf9..b89991a098 100644
--- a/wxPython/include/wx/wxPython/pyclasses.h
+++ b/wxPython/include/wx/wxPython/pyclasses.h
@@ -123,6 +123,7 @@ public:
 
 //---------------------------------------------------------------------------
 
+#ifndef __WXX11__
 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__
@@ -176,7 +177,7 @@ public:
     PYPRIVATE;
 };
 
-
+#endif
 
 
 //---------------------------------------------------------------------------
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 0c42993d77..645b2502e5 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -223,7 +223,10 @@ def Verify_WX_CONFIG():
         else:
             uf = ''
         ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR)
-        WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2)
+        port = WXPORT
+        if port == "x11":
+            port = "x11univ"
+        WX_CONFIG = 'wx%s%s%s-%s-config' % (port, uf, df, ver2)
 
         searchpath = os.environ["PATH"]
         for p in searchpath.split(':'):
diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index 366cc4e308..49eec5186f 100644
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -44,8 +44,10 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxPyChoiceNameStr);
 
+#ifndef __WXX11__
     int GetColumns();
     void SetColumns(const int n = 1);
+#endif
     void SetSelection(const int n);
     void SetStringSelection(const wxString& string);
     void SetString(int n, const wxString& s);
diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index 191ca7a74b..2f0896a208 100644
--- a/wxPython/src/_dataobj.i
+++ b/wxPython/src/_dataobj.i
@@ -424,7 +424,7 @@ public:
 
 //---------------------------------------------------------------------------
 
-#ifndef __WXGTK__
+#if !defined(__WXGTK__) && !defined(__WXX11__)
 
 %{
 #include <wx/metafile.h>
diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index 15f0f18777..20d64d671b 100644
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -14,11 +14,8 @@
 
 
 //---------------------------------------------------------------------------
+#ifndef __WXX11__
 
-%{
-%}
-
-//---------------------------------------------------------------------------
 %newgroup
 
 // flags for wxDropSource::DoDragDrop()
@@ -265,3 +262,5 @@ public:
     wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
 %}
 //---------------------------------------------------------------------------
+
+#endif
diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index 2fcaadd9e0..cfcdd02a39 100644
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -23,7 +23,7 @@
 class wxIcon : public wxGDIObject
 {
 public:
-    wxIcon(const wxString& name, long flags,
+    wxIcon(const wxString& name, wxBitmapType type,
            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 
@@ -51,7 +51,7 @@ public:
 
     
 #ifndef __WXMAC__
-    bool LoadFile(const wxString& name, long flags);
+    bool LoadFile(const wxString& name, wxBitmapType type);
 #endif
 
     // wxGDIImage methods
diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index 05d03382a5..ebef42f095 100644
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -137,7 +137,7 @@ public:
     bool  IsChecked(int index);
     void  Check(int index, int check = True);
 
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__WXX11__)
     int GetItemHeight();
 #endif
 
diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index 54a6812e35..e7f675a5db 100644
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -18,6 +18,7 @@
 %newgroup
 
 
+#ifndef __WXX11__
 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);
@@ -30,6 +31,7 @@ public:
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);
 };
+#endif
 
 //---------------------------------------------------------------------------
 
diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index 2cf934ce84..1b5dabacc1 100644
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -22,7 +22,7 @@ MAKE_CONST_WXSTRING2(ToggleButtonNameStr, _T("wxToggleButton"));
 
 
 %{
-#ifdef __WXMAC__
+#if defined(__WXMAC__) || defined(__WXX11__)
 // implement dummy classes and such for wxMac
 
 #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0
@@ -66,7 +66,7 @@ public:
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__WXX11__)
     bool Create(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,
diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 5f782c7a0f..1e23183f42 100644
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -250,7 +250,9 @@ public:
     wxSizer *CreateButtonSizer( long flags );
 
 
-    void SetModal(bool flag);
+    //void SetModal(bool flag);
+
+    // is the dialog in modal state right now?
     virtual bool IsModal() const;
 
     // Shows the dialog and starts a nested event loop that returns when
diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 34c35b3703..b446de9d06 100644
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -660,7 +660,7 @@ public:
     wxString GetHelpText() const;
 
 
-
+#ifndef __WXX11__
     // tooltips
     // --------
 
@@ -673,9 +673,11 @@ public:
     // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const;
     // LINK ERROR --> wxString GetToolTipText() const;
+#endif
 
 
-
+    
+#ifndef __WXX11__
     // drag and drop
     // -------------
 
@@ -688,7 +690,8 @@ public:
 #ifdef __WXMSW__  // TODO:  should I drop-kick this?
     void DragAcceptFiles(bool accept);
 #endif
-
+#endif
+    
 
     // constraints and sizers
     // ----------------------
diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp
index 2097fec017..acf7a3ad56 100644
--- a/wxPython/src/gtk/controls_wrap.cpp
+++ b/wxPython/src/gtk/controls_wrap.cpp
@@ -390,7 +390,7 @@ int wxRadioBox_GetNextItem(wxRadioBox const *self,int item,wxDirection dir,long
  static const wxString wxPySliderNameStr(wxSliderNameStr); 
  static const wxString wxPyToggleButtonNameStr(_T("wxToggleButton")); 
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) || defined(__WXX11__)
 // implement dummy classes and such for wxMac
 
 #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0
diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index c7f79a8192..6a705589c4 100644
--- a/wxPython/src/gtk/gdi.py
+++ b/wxPython/src/gtk/gdi.py
@@ -579,7 +579,7 @@ class Icon(GDIObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
-        """__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
+        """__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -591,7 +591,7 @@ class Icon(GDIObject):
         except: pass
 
     def LoadFile(*args, **kwargs):
-        """LoadFile(String name, long flags) -> bool"""
+        """LoadFile(String name, int type) -> bool"""
         return _gdi.Icon_LoadFile(*args, **kwargs)
 
     def Ok(*args, **kwargs):
diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp
index 1362c86dd4..534027e2b8 100644
--- a/wxPython/src/gtk/gdi_wrap.cpp
+++ b/wxPython/src/gtk/gdi_wrap.cpp
@@ -2844,17 +2844,17 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    long arg2 ;
+    int arg2 ;
     int arg3 = (int) -1 ;
     int arg4 = (int) -1 ;
     wxIcon *result;
     bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
-        (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL 
+        (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
@@ -2862,7 +2862,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);
+        result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -3013,16 +3013,16 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     wxString *arg2 = 0 ;
-    long arg3 ;
+    int arg3 ;
     bool result;
     bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "name",(char *) "flags", NULL 
+        (char *) "self",(char *) "name",(char *) "type", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
@@ -3031,7 +3031,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);
+        result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp
index 43c93bbf9e..13992b7db4 100644
--- a/wxPython/src/gtk/misc_wrap.cpp
+++ b/wxPython/src/gtk/misc_wrap.cpp
@@ -1056,8 +1056,6 @@ public:
 };    
 
 
-
-
 IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 
 
diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py
index aaaa0903a9..6d1cb29f78 100644
--- a/wxPython/src/gtk/windows.py
+++ b/wxPython/src/gtk/windows.py
@@ -414,10 +414,6 @@ class Dialog(TopLevelWindow):
         """CreateButtonSizer(long flags) -> Sizer"""
         return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
 
-    def SetModal(*args, **kwargs):
-        """SetModal(bool flag)"""
-        return _windows.Dialog_SetModal(*args, **kwargs)
-
     def IsModal(*args, **kwargs):
         """IsModal() -> bool"""
         return _windows.Dialog_IsModal(*args, **kwargs)
diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp
index 23433aff96..3c5aa870ca 100644
--- a/wxPython/src/gtk/windows_wrap.cpp
+++ b/wxPython/src/gtk/windows_wrap.cpp
@@ -3600,34 +3600,6 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Dialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxDialog *arg1 = (wxDialog *) 0 ;
-    bool arg2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "flag", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetModal",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = PyInt_AsLong(obj1) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetModal(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
 static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
@@ -20998,7 +20970,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Dialog_SetModal", (PyCFunction) _wrap_Dialog_SetModal, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS },