reSWIGged

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

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index deb69eba5d0086a062fad797fb6e4344bf37b3e7..51f8c3785a1d61ab12547618a6df9c5da84ba282 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -1850,13 +1850,13 @@ def FontFromNativeInfoString(*args, **kwargs):
     val.thisown = 1
     return val
 
-def Font2(*args, **kwargs):
+def FFont(*args, **kwargs):
     """
-    Font2(int pointSize, int family, int flags=FONTFLAG_DEFAULT, 
+    FFont(int pointSize, int family, int flags=FONTFLAG_DEFAULT, 
         String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font
     """
     if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName']
-    val = _gdi_.new_Font2(*args, **kwargs)
+    val = _gdi_.new_FFont(*args, **kwargs)
     val.thisown = 1
     return val
 
@@ -1871,6 +1871,16 @@ def FontFromPixelSize(*args, **kwargs):
     val.thisown = 1
     return val
 
+def FFontFromPixelSize(*args, **kwargs):
+    """
+    FFontFromPixelSize(Size pixelSize, int family, int flags=FONTFLAG_DEFAULT, 
+        String face=wxEmptyString, int encoding=FONTENCODING_DEFAULT) -> Font
+    """
+    if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName']
+    val = _gdi_.new_FFontFromPixelSize(*args, **kwargs)
+    val.thisown = 1
+    return val
+
 def Font_GetDefaultEncoding(*args, **kwargs):
     """Font_GetDefaultEncoding() -> int"""
     return _gdi_.Font_GetDefaultEncoding(*args, **kwargs)
@@ -1879,6 +1889,7 @@ def Font_SetDefaultEncoding(*args, **kwargs):
     """Font_SetDefaultEncoding(int encoding)"""
     return _gdi_.Font_SetDefaultEncoding(*args, **kwargs)
 
+Font2 = wx._deprecated(FFont, "Use `FFont` instead.") 
 #---------------------------------------------------------------------------
 
 class FontEnumerator(object):

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index e64e881ce17416bf9a199cbb8e163c6442f20adf..cd4177fca686a445e1e589ac14ded3c996f2004f 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -1930,6 +1930,9 @@ static wxFont *new_wxFont(wxSize const &pixelSize,int family,int style,int weigh
                                    style, weight, underlined,
                                    face, encoding);
         }
+static wxFont *new_wxFont(wxSize const &pixelSize,wxFontFamily family,int flags=wxFONTFLAG_DEFAULT,wxString const &face=wxEmptyString,wxFontEncoding encoding=wxFONTENCODING_DEFAULT){
+            return wxFontBase::New(pixelSize, family, flags, face, encoding);
+        }
 static bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : false; }
 static bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : true;  }
 
@@ -9373,7 +9376,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxFontFamily arg2 ;
@@ -9392,7 +9395,7 @@ static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) {
         (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     {
         arg1 = (int)(SWIG_As_int(obj0)); 
         if (SWIG_arg_fail(1)) SWIG_fail;
@@ -9526,6 +9529,77 @@ static PyObject *_wrap_new_FontFromPixelSize(PyObject *, PyObject *args, PyObjec
 }
 
 
+static PyObject *_wrap_new_FFontFromPixelSize(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxSize *arg1 = 0 ;
+    wxFontFamily arg2 ;
+    int arg3 = (int) wxFONTFLAG_DEFAULT ;
+    wxString const &arg4_defvalue = wxEmptyString ;
+    wxString *arg4 = (wxString *) &arg4_defvalue ;
+    wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+    wxFont *result;
+    wxSize temp1 ;
+    bool temp4 = false ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    char *kwnames[] = {
+        (char *) "pixelSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    {
+        arg1 = &temp1;
+        if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
+    }
+    {
+        arg2 = (wxFontFamily)(SWIG_As_int(obj1)); 
+        if (SWIG_arg_fail(2)) SWIG_fail;
+    }
+    if (obj2) {
+        {
+            arg3 = (int)(SWIG_As_int(obj2)); 
+            if (SWIG_arg_fail(3)) SWIG_fail;
+        }
+    }
+    if (obj3) {
+        {
+            arg4 = wxString_in_helper(obj3);
+            if (arg4 == NULL) SWIG_fail;
+            temp4 = true;
+        }
+    }
+    if (obj4) {
+        {
+            arg5 = (wxFontEncoding)(SWIG_As_int(obj4)); 
+            if (SWIG_arg_fail(5)) SWIG_fail;
+        }
+    }
+    {
+        if (!wxPyCheckForApp()) SWIG_fail;
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxFont *)new_wxFont((wxSize const &)*arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);
+    {
+        if (temp4)
+        delete arg4;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp4)
+        delete arg4;
+    }
+    return NULL;
+}
+
+
 static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
@@ -20740,8 +20814,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_Font", (PyCFunction) _wrap_delete_Font, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_FFont", (PyCFunction) _wrap_new_FFont, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_FontFromPixelSize", (PyCFunction) _wrap_new_FontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_FFontFromPixelSize", (PyCFunction) _wrap_new_FFontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index 09c9eeeead585fbd4ef0a5b23ef449bb2fa17268..c99efbcb5369c1a3f9cbfa67126321543596f1de 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -534,6 +534,15 @@ def SetCursor(*args, **kwargs):
     """SetCursor(Cursor cursor)"""
     return _misc_.SetCursor(*args, **kwargs)
 
+def GetXDisplay(*args, **kwargs):
+    """
+    GetXDisplay() -> void
+
+    Returns a swigified pointer to the X11 display.  Returns None on
+    other platforms.
+    """
+    return _misc_.GetXDisplay(*args, **kwargs)
+
 def BeginBusyCursor(*args, **kwargs):
     """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""
     return _misc_.BeginBusyCursor(*args, **kwargs)

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index 8e06a10843e03397973a8c5085936a007812c9a0..63b27b0452d312bdcee5657531b92a930b300e74 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -1356,86 +1356,87 @@ SWIG_Python_GetTypeList() {
 #define  SWIGTYPE_p_wxCaret swig_types[14] 
 #define  SWIGTYPE_ptrdiff_t swig_types[15] 
 #define  SWIGTYPE_std__ptrdiff_t swig_types[16] 
-#define  SWIGTYPE_p_int swig_types[17] 
-#define  SWIGTYPE_p_wxSize swig_types[18] 
-#define  SWIGTYPE_p_wxClipboard swig_types[19] 
-#define  SWIGTYPE_p_wxStopWatch swig_types[20] 
-#define  SWIGTYPE_p_wxDC swig_types[21] 
-#define  SWIGTYPE_p_wxClipboardLocker swig_types[22] 
-#define  SWIGTYPE_p_wxIcon swig_types[23] 
-#define  SWIGTYPE_p_wxLogStderr swig_types[24] 
-#define  SWIGTYPE_p_wxLogTextCtrl swig_types[25] 
-#define  SWIGTYPE_p_wxTextCtrl swig_types[26] 
-#define  SWIGTYPE_p_wxBusyCursor swig_types[27] 
-#define  SWIGTYPE_p_wxBitmapDataObject swig_types[28] 
-#define  SWIGTYPE_p_wxTextDataObject swig_types[29] 
-#define  SWIGTYPE_p_wxDataObject swig_types[30] 
-#define  SWIGTYPE_p_wxPyTextDataObject swig_types[31] 
-#define  SWIGTYPE_p_wxPyBitmapDataObject swig_types[32] 
-#define  SWIGTYPE_p_wxFileDataObject swig_types[33] 
-#define  SWIGTYPE_p_wxCustomDataObject swig_types[34] 
-#define  SWIGTYPE_p_wxURLDataObject swig_types[35] 
-#define  SWIGTYPE_p_wxMetafileDataObject swig_types[36] 
-#define  SWIGTYPE_p_wxSound swig_types[37] 
-#define  SWIGTYPE_p_wxTimerRunner swig_types[38] 
-#define  SWIGTYPE_p_wxLogWindow swig_types[39] 
-#define  SWIGTYPE_p_wxTimeSpan swig_types[40] 
-#define  SWIGTYPE_p_wxArrayString swig_types[41] 
-#define  SWIGTYPE_p_wxWindowDisabler swig_types[42] 
-#define  SWIGTYPE_p_form_ops_t swig_types[43] 
-#define  SWIGTYPE_p_wxToolTip swig_types[44] 
-#define  SWIGTYPE_p_wxDataObjectComposite swig_types[45] 
-#define  SWIGTYPE_p_wxSystemSettings swig_types[46] 
-#define  SWIGTYPE_p_wxFileConfig swig_types[47] 
-#define  SWIGTYPE_p_wxVideoMode swig_types[48] 
-#define  SWIGTYPE_p_wxDataObjectSimple swig_types[49] 
-#define  SWIGTYPE_p_wxPyDataObjectSimple swig_types[50] 
-#define  SWIGTYPE_p_wxDuplexMode swig_types[51] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[52] 
-#define  SWIGTYPE_p_wxRect swig_types[53] 
-#define  SWIGTYPE_p_char swig_types[54] 
-#define  SWIGTYPE_p_wxSingleInstanceChecker swig_types[55] 
-#define  SWIGTYPE_p_wxStandardPaths swig_types[56] 
-#define  SWIGTYPE_p_wxFileTypeInfo swig_types[57] 
-#define  SWIGTYPE_p_wxFrame swig_types[58] 
-#define  SWIGTYPE_p_wxTimer swig_types[59] 
-#define  SWIGTYPE_p_wxPaperSize swig_types[60] 
-#define  SWIGTYPE_p_wxMimeTypesManager swig_types[61] 
-#define  SWIGTYPE_p_wxPyArtProvider swig_types[62] 
-#define  SWIGTYPE_p_wxPyTipProvider swig_types[63] 
-#define  SWIGTYPE_p_wxTipProvider swig_types[64] 
-#define  SWIGTYPE_p_wxJoystick swig_types[65] 
-#define  SWIGTYPE_p_wxSystemOptions swig_types[66] 
-#define  SWIGTYPE_p_wxPoint swig_types[67] 
-#define  SWIGTYPE_p_wxJoystickEvent swig_types[68] 
-#define  SWIGTYPE_p_wxCursor swig_types[69] 
-#define  SWIGTYPE_p_wxObject swig_types[70] 
-#define  SWIGTYPE_p_wxOutputStream swig_types[71] 
-#define  SWIGTYPE_p_wxDateTime swig_types[72] 
-#define  SWIGTYPE_p_wxPyDropSource swig_types[73] 
-#define  SWIGTYPE_p_unsigned_long swig_types[74] 
-#define  SWIGTYPE_p_wxKillError swig_types[75] 
-#define  SWIGTYPE_p_wxWindow swig_types[76] 
-#define  SWIGTYPE_p_wxString swig_types[77] 
-#define  SWIGTYPE_p_wxPyProcess swig_types[78] 
-#define  SWIGTYPE_p_wxBitmap swig_types[79] 
-#define  SWIGTYPE_p_wxConfig swig_types[80] 
+#define  SWIGTYPE_p_void swig_types[17] 
+#define  SWIGTYPE_p_int swig_types[18] 
+#define  SWIGTYPE_p_wxSize swig_types[19] 
+#define  SWIGTYPE_p_wxClipboard swig_types[20] 
+#define  SWIGTYPE_p_wxStopWatch swig_types[21] 
+#define  SWIGTYPE_p_wxDC swig_types[22] 
+#define  SWIGTYPE_p_wxClipboardLocker swig_types[23] 
+#define  SWIGTYPE_p_wxIcon swig_types[24] 
+#define  SWIGTYPE_p_wxLogStderr swig_types[25] 
+#define  SWIGTYPE_p_wxLogTextCtrl swig_types[26] 
+#define  SWIGTYPE_p_wxTextCtrl swig_types[27] 
+#define  SWIGTYPE_p_wxBusyCursor swig_types[28] 
+#define  SWIGTYPE_p_wxBitmapDataObject swig_types[29] 
+#define  SWIGTYPE_p_wxTextDataObject swig_types[30] 
+#define  SWIGTYPE_p_wxDataObject swig_types[31] 
+#define  SWIGTYPE_p_wxPyTextDataObject swig_types[32] 
+#define  SWIGTYPE_p_wxPyBitmapDataObject swig_types[33] 
+#define  SWIGTYPE_p_wxFileDataObject swig_types[34] 
+#define  SWIGTYPE_p_wxCustomDataObject swig_types[35] 
+#define  SWIGTYPE_p_wxURLDataObject swig_types[36] 
+#define  SWIGTYPE_p_wxMetafileDataObject swig_types[37] 
+#define  SWIGTYPE_p_wxSound swig_types[38] 
+#define  SWIGTYPE_p_wxTimerRunner swig_types[39] 
+#define  SWIGTYPE_p_wxLogWindow swig_types[40] 
+#define  SWIGTYPE_p_wxTimeSpan swig_types[41] 
+#define  SWIGTYPE_p_wxArrayString swig_types[42] 
+#define  SWIGTYPE_p_wxWindowDisabler swig_types[43] 
+#define  SWIGTYPE_p_form_ops_t swig_types[44] 
+#define  SWIGTYPE_p_wxToolTip swig_types[45] 
+#define  SWIGTYPE_p_wxDataObjectComposite swig_types[46] 
+#define  SWIGTYPE_p_wxSystemSettings swig_types[47] 
+#define  SWIGTYPE_p_wxFileConfig swig_types[48] 
+#define  SWIGTYPE_p_wxVideoMode swig_types[49] 
+#define  SWIGTYPE_p_wxDataObjectSimple swig_types[50] 
+#define  SWIGTYPE_p_wxPyDataObjectSimple swig_types[51] 
+#define  SWIGTYPE_p_wxDuplexMode swig_types[52] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[53] 
+#define  SWIGTYPE_p_wxRect swig_types[54] 
+#define  SWIGTYPE_p_char swig_types[55] 
+#define  SWIGTYPE_p_wxSingleInstanceChecker swig_types[56] 
+#define  SWIGTYPE_p_wxStandardPaths swig_types[57] 
+#define  SWIGTYPE_p_wxFileTypeInfo swig_types[58] 
+#define  SWIGTYPE_p_wxFrame swig_types[59] 
+#define  SWIGTYPE_p_wxTimer swig_types[60] 
+#define  SWIGTYPE_p_wxPaperSize swig_types[61] 
+#define  SWIGTYPE_p_wxMimeTypesManager swig_types[62] 
+#define  SWIGTYPE_p_wxPyArtProvider swig_types[63] 
+#define  SWIGTYPE_p_wxPyTipProvider swig_types[64] 
+#define  SWIGTYPE_p_wxTipProvider swig_types[65] 
+#define  SWIGTYPE_p_wxJoystick swig_types[66] 
+#define  SWIGTYPE_p_wxSystemOptions swig_types[67] 
+#define  SWIGTYPE_p_wxPoint swig_types[68] 
+#define  SWIGTYPE_p_wxJoystickEvent swig_types[69] 
+#define  SWIGTYPE_p_wxCursor swig_types[70] 
+#define  SWIGTYPE_p_wxObject swig_types[71] 
+#define  SWIGTYPE_p_wxOutputStream swig_types[72] 
+#define  SWIGTYPE_p_wxDateTime swig_types[73] 
+#define  SWIGTYPE_p_wxPyDropSource swig_types[74] 
+#define  SWIGTYPE_p_unsigned_long swig_types[75] 
+#define  SWIGTYPE_p_wxKillError swig_types[76] 
+#define  SWIGTYPE_p_wxWindow swig_types[77] 
+#define  SWIGTYPE_p_wxString swig_types[78] 
+#define  SWIGTYPE_p_wxPyProcess swig_types[79] 
+#define  SWIGTYPE_p_wxBitmap swig_types[80] 
 #define  SWIGTYPE_unsigned_int swig_types[81] 
 #define  SWIGTYPE_p_unsigned_int swig_types[82] 
-#define  SWIGTYPE_p_unsigned_char swig_types[83] 
-#define  SWIGTYPE_p_wxChar swig_types[84] 
-#define  SWIGTYPE_p_wxBusyInfo swig_types[85] 
-#define  SWIGTYPE_p_wxPyDropTarget swig_types[86] 
-#define  SWIGTYPE_p_wxPyTextDropTarget swig_types[87] 
-#define  SWIGTYPE_p_wxPyFileDropTarget swig_types[88] 
-#define  SWIGTYPE_p_wxProcessEvent swig_types[89] 
-#define  SWIGTYPE_p_wxPyLog swig_types[90] 
-#define  SWIGTYPE_p_wxLogNull swig_types[91] 
-#define  SWIGTYPE_p_wxColour swig_types[92] 
-#define  SWIGTYPE_p_wxPyTimer swig_types[93] 
-#define  SWIGTYPE_p_wxConfigPathChanger swig_types[94] 
-#define  SWIGTYPE_p_wxDateSpan swig_types[95] 
-static swig_type_info *swig_types[97];
+#define  SWIGTYPE_p_wxConfig swig_types[83] 
+#define  SWIGTYPE_p_unsigned_char swig_types[84] 
+#define  SWIGTYPE_p_wxChar swig_types[85] 
+#define  SWIGTYPE_p_wxBusyInfo swig_types[86] 
+#define  SWIGTYPE_p_wxPyDropTarget swig_types[87] 
+#define  SWIGTYPE_p_wxPyTextDropTarget swig_types[88] 
+#define  SWIGTYPE_p_wxPyFileDropTarget swig_types[89] 
+#define  SWIGTYPE_p_wxProcessEvent swig_types[90] 
+#define  SWIGTYPE_p_wxPyLog swig_types[91] 
+#define  SWIGTYPE_p_wxLogNull swig_types[92] 
+#define  SWIGTYPE_p_wxColour swig_types[93] 
+#define  SWIGTYPE_p_wxPyTimer swig_types[94] 
+#define  SWIGTYPE_p_wxConfigPathChanger swig_types[95] 
+#define  SWIGTYPE_p_wxDateSpan swig_types[96] 
+static swig_type_info *swig_types[98];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -1705,6 +1706,16 @@ SWIGINTERNSHORT PyObject*
 }
 
 
+    void* wxGetXDisplay()
+    {
+#ifdef __WXGTK__
+        return wxGetDisplay();
+#else
+        return NULL;
+#endif
+    }
+
+
     void wxWakeUpMainThread() {}
 
 
@@ -5870,6 +5881,29 @@ static PyObject *_wrap_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
 }
 
 
+static PyObject *_wrap_GetXDisplay(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    void *result;
+    char *kwnames[] = {
+        NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetXDisplay",kwnames)) goto fail;
+    {
+        if (!wxPyCheckForApp()) SWIG_fail;
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (void *)wxGetXDisplay();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_void, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_BeginBusyCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = (wxCursor *) wxHOURGLASS_CURSOR ;
@@ -31529,6 +31563,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"ClientDisplayRect", (PyCFunction) _wrap_ClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GetClientDisplayRect", (PyCFunction) _wrap_GetClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SetCursor", (PyCFunction) _wrap_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"GetXDisplay", (PyCFunction) _wrap_GetXDisplay, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BeginBusyCursor", (PyCFunction) _wrap_BeginBusyCursor, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GetActiveWindow", (PyCFunction) _wrap_GetActiveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -32800,6 +32835,7 @@ static swig_type_info _swigt__p_wxTimerEvent[] = {{"_p_wxTimerEvent", 0, "wxTime
 static swig_type_info _swigt__p_wxCaret[] = {{"_p_wxCaret", 0, "wxCaret *", 0, 0, 0, 0},{"_p_wxCaret", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::ptrdiff_t", 0, 0, 0, 0},{"_std__ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0, 0, 0, 0},{"_p_void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxClipboard[] = {{"_p_wxClipboard", 0, "wxClipboard *", 0, 0, 0, 0},{"_p_wxClipboard", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -32863,9 +32899,9 @@ static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0
 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyProcess[] = {{"_p_wxPyProcess", 0, "wxPyProcess *", 0, 0, 0, 0},{"_p_wxPyProcess", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxConfig[] = {{"_p_wxConfig", 0, "wxConfig *", 0, 0, 0, 0},{"_p_wxConfig", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned int|std::size_t", 0, 0, 0, 0},{"_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxConfig[] = {{"_p_wxConfig", 0, "wxConfig *", 0, 0, 0, 0},{"_p_wxConfig", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxChar[] = {{"_p_wxChar", 0, "wxChar *", 0, 0, 0, 0},{"_p_wxChar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxBusyInfo[] = {{"_p_wxBusyInfo", 0, "wxBusyInfo *", 0, 0, 0, 0},{"_p_wxBusyInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -32898,6 +32934,7 @@ _swigt__p_wxTimerEvent,
 _swigt__p_wxCaret, 
 _swigt__ptrdiff_t, 
 _swigt__std__ptrdiff_t, 
+_swigt__p_void, 
 _swigt__p_int, 
 _swigt__p_wxSize, 
 _swigt__p_wxClipboard, 
@@ -32961,9 +32998,9 @@ _swigt__p_wxWindow,
 _swigt__p_wxString, 
 _swigt__p_wxPyProcess, 
 _swigt__p_wxBitmap, 
-_swigt__p_wxConfig, 
 _swigt__unsigned_int, 
 _swigt__p_unsigned_int, 
+_swigt__p_wxConfig, 
 _swigt__p_unsigned_char, 
 _swigt__p_wxChar, 
 _swigt__p_wxBusyInfo, 

diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py
index d2d8e834a10014787829966070efa24b455d5322..2173ab408636d7532430f88ae7e640a8b4529480 100644 (file)
--- a/wxPython/wxPython/_gdi.py
+++ b/wxPython/wxPython/_gdi.py
@@ -211,8 +211,9 @@ wxFont = wx._gdi.Font
 wxFontPtr = wx._gdi.FontPtr
 wxFontFromNativeInfo = wx._gdi.FontFromNativeInfo
 wxFontFromNativeInfoString = wx._gdi.FontFromNativeInfoString
-wxFont2 = wx._gdi.Font2
+wxFFont = wx._gdi.FFont
 wxFontFromPixelSize = wx._gdi.FontFromPixelSize
+wxFFontFromPixelSize = wx._gdi.FFontFromPixelSize
 wxFont_GetDefaultEncoding = wx._gdi.Font_GetDefaultEncoding
 wxFont_SetDefaultEncoding = wx._gdi.Font_SetDefaultEncoding
 wxFontEnumerator = wx._gdi.FontEnumerator

diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py
index 6ac4e858c0042e0635997ded042f3f2408913c8e..dca3ced13e8aa8b4b93012fb00465a1ffe9bb2a4 100644 (file)
--- a/wxPython/wxPython/_misc.py
+++ b/wxPython/wxPython/_misc.py
@@ -184,6 +184,7 @@ wxGetDisplaySizeMM = wx._misc.GetDisplaySizeMM
 wxClientDisplayRect = wx._misc.ClientDisplayRect
 wxGetClientDisplayRect = wx._misc.GetClientDisplayRect
 wxSetCursor = wx._misc.SetCursor
+wxGetXDisplay = wx._misc.GetXDisplay
 wxBeginBusyCursor = wx._misc.BeginBusyCursor
 wxGetActiveWindow = wx._misc.GetActiveWindow
 wxGenericFindWindowAtPoint = wx._misc.GenericFindWindowAtPoint