reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index a2adc3117058140bd9e0310ccfd7958960c78b21..c52f48d9fc69965022f60da436c091f2af08228f 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -21,11 +21,6 @@
 %rename(CENTER_FRAME)                       wxCENTER_FRAME;
 %rename(CENTRE_ON_SCREEN)                   wxCENTRE_ON_SCREEN;
 %rename(CENTER_ON_SCREEN)                   wxCENTER_ON_SCREEN;
-%rename(ED_CLIENT_MARGIN)                   wxED_CLIENT_MARGIN;
-%rename(ED_BUTTONS_BOTTOM)                  wxED_BUTTONS_BOTTOM;
-%rename(ED_BUTTONS_RIGHT)                   wxED_BUTTONS_RIGHT;
-%rename(ED_STATIC_LINE)                     wxED_STATIC_LINE;
-%rename(EXT_DIALOG_STYLE)                   wxEXT_DIALOG_STYLE;
 %rename(CLIP_CHILDREN)                      wxCLIP_CHILDREN;
 %rename(CLIP_SIBLINGS)                      wxCLIP_SIBLINGS;
 %rename(ALWAYS_SHOW_SB)                     wxALWAYS_SHOW_SB;

diff --git a/wxPython/src/__windows_rename.i b/wxPython/src/__windows_rename.i
index fa1b5f7e7914abed177561b90946d70182f3eae8..517ad4c354b7bf418fa0436459a17efd81229090 100644 (file)
--- a/wxPython/src/__windows_rename.i
+++ b/wxPython/src/__windows_rename.i
@@ -27,6 +27,8 @@
 %rename(FRAME_NO_TASKBAR)                   wxFRAME_NO_TASKBAR;
 %rename(FRAME_SHAPED)                       wxFRAME_SHAPED;
 %rename(FRAME_DRAWER)                       wxFRAME_DRAWER;
+%rename(FRAME_EX_METAL)                     wxFRAME_EX_METAL;
+%rename(DIALOG_EX_METAL)                    wxDIALOG_EX_METAL;
 %rename(DIALOG_MODAL)                       wxDIALOG_MODAL;
 %rename(DIALOG_MODELESS)                    wxDIALOG_MODELESS;
 %rename(USER_COLOURS)                       wxUSER_COLOURS;

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 6e21d72a20ab522d962bac0c1eaa49816e9fafa3..93078afc8b6d4f6443e5386557ccaadea4adc8a6 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -91,11 +91,6 @@ POPUP_WINDOW = _core_.POPUP_WINDOW
 CENTER_FRAME = _core_.CENTER_FRAME
 CENTRE_ON_SCREEN = _core_.CENTRE_ON_SCREEN
 CENTER_ON_SCREEN = _core_.CENTER_ON_SCREEN
-ED_CLIENT_MARGIN = _core_.ED_CLIENT_MARGIN
-ED_BUTTONS_BOTTOM = _core_.ED_BUTTONS_BOTTOM
-ED_BUTTONS_RIGHT = _core_.ED_BUTTONS_RIGHT
-ED_STATIC_LINE = _core_.ED_STATIC_LINE
-EXT_DIALOG_STYLE = _core_.EXT_DIALOG_STYLE
 CLIP_CHILDREN = _core_.CLIP_CHILDREN
 CLIP_SIBLINGS = _core_.CLIP_SIBLINGS
 ALWAYS_SHOW_SB = _core_.ALWAYS_SHOW_SB

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index 20c825759e9b58d44e9a084800e2eab76cee0886..fb9d34ae38b02866e1ed55320c874f0024f3df6e 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -47544,21 +47544,6 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_From_int((int)(wxCENTER_ON_SCREEN))); 
     }
-    {
-        PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_From_int((int)(wxED_CLIENT_MARGIN))); 
-    }
-    {
-        PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_From_int((int)(wxED_BUTTONS_BOTTOM))); 
-    }
-    {
-        PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_From_int((int)(wxED_BUTTONS_RIGHT))); 
-    }
-    {
-        PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_From_int((int)(wxED_STATIC_LINE))); 
-    }
-    {
-        PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_From_int((int)(wxEXT_DIALOG_STYLE))); 
-    }
     {
         PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_From_int((int)(wxCLIP_CHILDREN))); 
     }

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index ceee5accd33d269368746c2deeaf920798aebf40..a2a620f64a77e8d7287f334fcf1964f0920a11e0 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -3968,7 +3968,7 @@ class BufferedDC(MemoryDC):
         return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
         """
-        __init__(self, DC dc, Bitmap buffer, int style=BUFFER_CLIENT_AREA) -> BufferedDC
+        __init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC
         __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC
 
         Constructs a buffered DC.

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index bed2164d1e24440d4ee2ea81bcf5872ab8bf0dbe..c733f3815b8daa7913c4ede56a92d23ff55dff48 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -17221,23 +17221,26 @@ static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) {
 static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxBitmap *arg2 = 0 ;
+    wxBitmap const &arg2_defvalue = wxNullBitmap ;
+    wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
     int arg3 = (int) wxBUFFER_CLIENT_AREA ;
     wxBufferedDC *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
+    if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
     SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
     if (SWIG_arg_fail(1)) SWIG_fail;
-    {
-        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
-        if (SWIG_arg_fail(2)) SWIG_fail;
-        if (arg2 == NULL) {
-            SWIG_null_ref("wxBitmap");
+    if (obj1) {
+        {
+            SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+            if (SWIG_arg_fail(2)) SWIG_fail;
+            if (arg2 == NULL) {
+                SWIG_null_ref("wxBitmap");
+            }
+            if (SWIG_arg_fail(2)) SWIG_fail;
         }
-        if (SWIG_arg_fail(2)) SWIG_fail;
     }
     if (obj2) {
         {
@@ -17308,7 +17311,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     for (ii = 0; (ii < argc) && (ii < 3); ii++) {
         argv[ii] = PyTuple_GetItem(args,ii);
     }
-    if ((argc >= 2) && (argc <= 3)) {
+    if ((argc >= 1) && (argc <= 3)) {
         int _v;
         {
             void *ptr;
@@ -17320,6 +17323,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
+            if (argc <= 1) {
+                return _wrap_new_BufferedDC__SWIG_0(self,args);
+            }
             {
                 void *ptr = 0;
                 if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index b8c6bdb12a82a22e9eebc7ef140cb15952f6dbbe..cba674b6b35ec16e6327f4ac41b878650ae75d9a 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -155,7 +155,7 @@ class SystemSettings(object):
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):
-        """GetMetric(int index) -> int"""
+        """GetMetric(int index, Window win=None) -> int"""
         return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
@@ -191,7 +191,7 @@ def SystemSettings_GetFont(*args, **kwargs):
     return _misc_.SystemSettings_GetFont(*args, **kwargs)
 
 def SystemSettings_GetMetric(*args, **kwargs):
-    """SystemSettings_GetMetric(int index) -> int"""
+    """SystemSettings_GetMetric(int index, Window win=None) -> int"""
     return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
 def SystemSettings_HasFeature(*args, **kwargs):

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index f90f006be132be8b747602ffb2d6f1421c8a86f4..eb77e1e95c7a3ffac0d428d72499cb906c1be762 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -3057,21 +3057,27 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *, PyObject *args, PyObje
 static PyObject *_wrap_SystemSettings_GetMetric(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSystemMetric arg1 ;
+    wxWindow *arg2 = (wxWindow *) NULL ;
     int result;
     PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "index", NULL 
+        (char *) "index",(char *) "win", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetMetric",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SystemSettings_GetMetric",kwnames,&obj0,&obj1)) goto fail;
     {
         arg1 = (wxSystemMetric)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
     }
+    if (obj1) {
+        SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0);
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
     {
         if (!wxPyCheckForApp()) SWIG_fail;
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1);
+        result = (int)wxSystemSettings::GetMetric((wxSystemMetric )arg1,arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index a28fb1ec524d6fc4486a3c9c68fcffd53e66e4b3..7f31a6179e473daf24614fcd8563762057d90b26 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -352,6 +352,8 @@ FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_DRAWER = _windows_.FRAME_DRAWER
+FRAME_EX_METAL = _windows_.FRAME_EX_METAL
+DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL
 DIALOG_MODAL = _windows_.DIALOG_MODAL
 DIALOG_MODELESS = _windows_.DIALOG_MODELESS
 USER_COLOURS = _windows_.USER_COLOURS

diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index 61f361ffea8dcf0474c7a6f07d4acf0ddef345e4..59519f2af097cc3742afd60fd674e0213ce383ed 100644 (file)
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -30024,6 +30024,12 @@ SWIGEXPORT(void) SWIG_init(void) {
     {
         PyDict_SetItemString(d,"FRAME_DRAWER", SWIG_From_int((int)(wxFRAME_DRAWER))); 
     }
+    {
+        PyDict_SetItemString(d,"FRAME_EX_METAL", SWIG_From_int((int)(wxFRAME_EX_METAL))); 
+    }
+    {
+        PyDict_SetItemString(d,"DIALOG_EX_METAL", SWIG_From_int((int)(wxDIALOG_EX_METAL))); 
+    }
     {
         PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_From_int((int)(wxDIALOG_MODAL))); 
     }

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index ca5f4ecc657340e35137a38f74a1eba6fc32ecf9..b978c59d94260b450fe53c56bad5f3f06d64756c 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -37,11 +37,6 @@ wxPOPUP_WINDOW = wx._core.POPUP_WINDOW
 wxCENTER_FRAME = wx._core.CENTER_FRAME
 wxCENTRE_ON_SCREEN = wx._core.CENTRE_ON_SCREEN
 wxCENTER_ON_SCREEN = wx._core.CENTER_ON_SCREEN
-wxED_CLIENT_MARGIN = wx._core.ED_CLIENT_MARGIN
-wxED_BUTTONS_BOTTOM = wx._core.ED_BUTTONS_BOTTOM
-wxED_BUTTONS_RIGHT = wx._core.ED_BUTTONS_RIGHT
-wxED_STATIC_LINE = wx._core.ED_STATIC_LINE
-wxEXT_DIALOG_STYLE = wx._core.EXT_DIALOG_STYLE
 wxCLIP_CHILDREN = wx._core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx._core.CLIP_SIBLINGS
 wxALWAYS_SHOW_SB = wx._core.ALWAYS_SHOW_SB

diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py
index 405bf21491b1620e2d15832f256dc4b2690be559..7cd51fd621cd05ad31da6ec336a92a427a878f70 100644 (file)
--- a/wxPython/wxPython/_windows.py
+++ b/wxPython/wxPython/_windows.py
@@ -53,6 +53,8 @@ wxFRAME_NO_WINDOW_MENU = wx._windows.FRAME_NO_WINDOW_MENU
 wxFRAME_NO_TASKBAR = wx._windows.FRAME_NO_TASKBAR
 wxFRAME_SHAPED = wx._windows.FRAME_SHAPED
 wxFRAME_DRAWER = wx._windows.FRAME_DRAWER
+wxFRAME_EX_METAL = wx._windows.FRAME_EX_METAL
+wxDIALOG_EX_METAL = wx._windows.DIALOG_EX_METAL
 wxDIALOG_MODAL = wx._windows.DIALOG_MODAL
 wxDIALOG_MODELESS = wx._windows.DIALOG_MODELESS
 wxUSER_COLOURS = wx._windows.USER_COLOURS