From b2df227bb042dd9f3b40c003e56729566eef7910 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 15 Apr 2004 19:22:27 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/core.py | 50 +++--- wxPython/src/gtk/core_wrap.cpp | 261 +++++++++++++++++++++++---- wxPython/src/gtk/gdi.py | 57 ++++-- wxPython/src/gtk/gdi_wrap.cpp | 285 +++++++++++++++++++++++++----- wxPython/src/gtk/grid.py | 2 +- wxPython/src/gtk/grid_wrap.cpp | 18 +- wxPython/src/gtk/windows.py | 21 +++ wxPython/src/gtk/windows_wrap.cpp | 21 +++ wxPython/wxPython/core.py | 26 +-- wxPython/wxPython/gdi.py | 5 +- wxPython/wxPython/windows.py | 21 +++ 11 files changed, 615 insertions(+), 152 deletions(-) diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py index 296206f5e5..4f9ecc8faf 100644 --- a/wxPython/src/gtk/core.py +++ b/wxPython/src/gtk/core.py @@ -24,37 +24,12 @@ SIMPLE_BORDER = _core.SIMPLE_BORDER STATIC_BORDER = _core.STATIC_BORDER TRANSPARENT_WINDOW = _core.TRANSPARENT_WINDOW NO_BORDER = _core.NO_BORDER -USER_COLOURS = _core.USER_COLOURS -NO_3D = _core.NO_3D TAB_TRAVERSAL = _core.TAB_TRAVERSAL WANTS_CHARS = _core.WANTS_CHARS POPUP_WINDOW = _core.POPUP_WINDOW CENTER_FRAME = _core.CENTER_FRAME CENTRE_ON_SCREEN = _core.CENTRE_ON_SCREEN CENTER_ON_SCREEN = _core.CENTER_ON_SCREEN -STAY_ON_TOP = _core.STAY_ON_TOP -ICONIZE = _core.ICONIZE -MINIMIZE = _core.MINIMIZE -MAXIMIZE = _core.MAXIMIZE -CLOSE_BOX = _core.CLOSE_BOX -THICK_FRAME = _core.THICK_FRAME -SYSTEM_MENU = _core.SYSTEM_MENU -MINIMIZE_BOX = _core.MINIMIZE_BOX -MAXIMIZE_BOX = _core.MAXIMIZE_BOX -TINY_CAPTION_HORIZ = _core.TINY_CAPTION_HORIZ -TINY_CAPTION_VERT = _core.TINY_CAPTION_VERT -RESIZE_BOX = _core.RESIZE_BOX -RESIZE_BORDER = _core.RESIZE_BORDER -DIALOG_MODAL = _core.DIALOG_MODAL -DIALOG_MODELESS = _core.DIALOG_MODELESS -DIALOG_NO_PARENT = _core.DIALOG_NO_PARENT -DEFAULT_FRAME_STYLE = _core.DEFAULT_FRAME_STYLE -DEFAULT_DIALOG_STYLE = _core.DEFAULT_DIALOG_STYLE -FRAME_TOOL_WINDOW = _core.FRAME_TOOL_WINDOW -FRAME_FLOAT_ON_PARENT = _core.FRAME_FLOAT_ON_PARENT -FRAME_NO_WINDOW_MENU = _core.FRAME_NO_WINDOW_MENU -FRAME_NO_TASKBAR = _core.FRAME_NO_TASKBAR -FRAME_SHAPED = _core.FRAME_SHAPED ED_CLIENT_MARGIN = _core.ED_CLIENT_MARGIN ED_BUTTONS_BOTTOM = _core.ED_BUTTONS_BOTTOM ED_BUTTONS_RIGHT = _core.ED_BUTTONS_RIGHT @@ -2116,6 +2091,10 @@ class Image(Object): """GetHeight() -> int""" return _core.Image_GetHeight(*args, **kwargs) + def GetSize(*args, **kwargs): + """GetSize() -> Size""" + return _core.Image_GetSize(*args, **kwargs) + def GetSubImage(*args, **kwargs): """GetSubImage(Rect rect) -> Image""" return _core.Image_GetSubImage(*args, **kwargs) @@ -2293,9 +2272,12 @@ def ImageFromStreamMime(*args, **kwargs): val.thisown = 1 return val -def EmptyImage(*args, **kwargs): - """EmptyImage(int width=0, int height=0, bool clear=True) -> Image""" - val = _core.new_EmptyImage(*args, **kwargs) +def EmptyImage(*args): + """ + EmptyImage(int width=0, int height=0, bool clear=True) -> Image + EmptyImage(Size size, bool clear=True) -> Image + """ + val = _core.new_EmptyImage(*args) val.thisown = 1 return val @@ -6647,6 +6629,10 @@ class Window(EvtHandler): """ return _core.Window_SetBackgroundColour(*args, **kwargs) + def SetDefaultBackgroundColour(*args, **kwargs): + """SetDefaultBackgroundColour(Colour colour)""" + return _core.Window_SetDefaultBackgroundColour(*args, **kwargs) + def SetForegroundColour(*args, **kwargs): """ SetForegroundColour(Colour colour) -> bool @@ -6658,6 +6644,10 @@ class Window(EvtHandler): """ return _core.Window_SetForegroundColour(*args, **kwargs) + def SetDefaultForegroundColour(*args, **kwargs): + """SetDefaultForegroundColour(Colour colour)""" + return _core.Window_SetDefaultForegroundColour(*args, **kwargs) + def GetBackgroundColour(*args, **kwargs): """ GetBackgroundColour() -> Colour @@ -6704,6 +6694,10 @@ class Window(EvtHandler): """ return _core.Window_SetFont(*args, **kwargs) + def SetDefaultFont(*args, **kwargs): + """SetDefaultFont(Font font)""" + return _core.Window_SetDefaultFont(*args, **kwargs) + def GetFont(*args, **kwargs): """ GetFont() -> Font diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index 890f065427..219772051a 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -1094,12 +1094,15 @@ SWIG_CheckUnsignedChar(PyObject* obj) } } -wxImage *new_wxImage(int width,int height,bool clear){ +wxImage *new_wxImage__SWIG_0(int width,int height,bool clear){ if (width > 0 && height > 0) return new wxImage(width, height, clear); else return new wxImage; } +wxImage *new_wxImage__SWIG_1(wxSize const &size,bool clear){ + return new wxImage(size.x, size.y, clear); + } wxImage *new_wxImage(wxBitmap const &bitmap){ return new wxImage(bitmap.ConvertToImage()); } @@ -1113,6 +1116,10 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){ memcpy(copy, data, width*height*3); return new wxImage(width, height, copy, False); } +wxSize wxImage_GetSize(wxImage *self){ + wxSize size(self->GetWidth(), self->GetHeight()); + return size; + } PyObject *wxImage_GetData(wxImage *self){ unsigned char* data = self->GetData(); int len = self->GetWidth() * self->GetHeight() * 3; @@ -8784,7 +8791,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P } -static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_EmptyImage__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; int arg1 = (int) 0 ; int arg2 = (int) 0 ; @@ -8793,11 +8800,8 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "width",(char *) "height",(char *) "clear", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"|OOO:new_EmptyImage",&obj0,&obj1,&obj2)) goto fail; if (obj0) { arg1 = (int) SWIG_AsInt(obj0); if (PyErr_Occurred()) SWIG_fail; @@ -8812,7 +8816,39 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxImage *)new_wxImage(arg1,arg2,arg3); + result = (wxImage *)new_wxImage__SWIG_0(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_EmptyImage__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSize *arg1 = 0 ; + bool arg2 = (bool) True ; + wxImage *result; + wxSize temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:new_EmptyImage",&obj0,&obj1)) goto fail; + { + arg1 = &temp1; + if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; + } + if (obj1) { + arg2 = (bool) SWIG_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxImage *)new_wxImage__SWIG_1((wxSize const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8824,6 +8860,58 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 3); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 0) && (argc <= 3)) { + int _v; + if (argc <= 0) { + return _wrap_new_EmptyImage__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[0]); + if (_v) { + if (argc <= 1) { + return _wrap_new_EmptyImage__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[1]); + if (_v) { + if (argc <= 2) { + return _wrap_new_EmptyImage__SWIG_0(self,args); + } + _v = SWIG_CheckBool(argv[2]); + if (_v) { + return _wrap_new_EmptyImage__SWIG_0(self,args); + } + } + } + } + if ((argc >= 1) && (argc <= 2)) { + int _v; + { + _v = wxPySimple_typecheck(argv[0], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 1) { + return _wrap_new_EmptyImage__SWIG_1(self,args); + } + _v = SWIG_CheckBool(argv[1]); + if (_v) { + return _wrap_new_EmptyImage__SWIG_1(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_EmptyImage'"); + return NULL; +} + + static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = 0 ; @@ -10008,6 +10096,36 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Image_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage *arg1 = (wxImage *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_GetSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxImage_GetSize(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Image_GetSubImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; @@ -25876,6 +25994,38 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_SetDefaultBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxColour *arg2 = 0 ; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultBackgroundColour",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaultBackgroundColour((wxColour const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -25911,6 +26061,38 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args } +static PyObject *_wrap_Window_SetDefaultForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxColour *arg2 = 0 ; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultForegroundColour",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaultForegroundColour((wxColour const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -26077,6 +26259,40 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_Window_SetDefaultFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxFont *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "font", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDefaultFont",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxFont, + SWIG_POINTER_EXCEPTION | 0)) == -1) + SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); + SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDefaultFont((wxFont const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -40199,7 +40415,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromStream", (PyCFunction) _wrap_new_ImageFromStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromStreamMime", (PyCFunction) _wrap_new_ImageFromStreamMime, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_EmptyImage", _wrap_new_EmptyImage, METH_VARARGS }, { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS }, @@ -40228,6 +40444,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Image_Ok", (PyCFunction) _wrap_Image_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_GetWidth", (PyCFunction) _wrap_Image_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_GetHeight", (PyCFunction) _wrap_Image_GetHeight, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Image_GetSize", (PyCFunction) _wrap_Image_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_GetSubImage", (PyCFunction) _wrap_Image_GetSubImage, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_Copy", (PyCFunction) _wrap_Image_Copy, METH_VARARGS | METH_KEYWORDS }, { (char *)"Image_Paste", (PyCFunction) _wrap_Image_Paste, METH_VARARGS | METH_KEYWORDS }, @@ -40799,12 +41016,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetDefaultBackgroundColour", (PyCFunction) _wrap_Window_SetDefaultBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetDefaultForegroundColour", (PyCFunction) _wrap_Window_SetDefaultForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Window_SetDefaultFont", (PyCFunction) _wrap_Window_SetDefaultFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS }, { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS }, @@ -41980,37 +42200,12 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"STATIC_BORDER", SWIG_FromInt((int)wxSTATIC_BORDER)); PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_FromInt((int)wxTRANSPARENT_WINDOW)); PyDict_SetItemString(d,"NO_BORDER", SWIG_FromInt((int)wxNO_BORDER)); - PyDict_SetItemString(d,"USER_COLOURS", SWIG_FromInt((int)wxUSER_COLOURS)); - PyDict_SetItemString(d,"NO_3D", SWIG_FromInt((int)wxNO_3D)); PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_FromInt((int)wxTAB_TRAVERSAL)); PyDict_SetItemString(d,"WANTS_CHARS", SWIG_FromInt((int)wxWANTS_CHARS)); PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_FromInt((int)wxPOPUP_WINDOW)); PyDict_SetItemString(d,"CENTER_FRAME", SWIG_FromInt((int)wxCENTER_FRAME)); PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_FromInt((int)wxCENTRE_ON_SCREEN)); PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_FromInt((int)wxCENTER_ON_SCREEN)); - PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_FromInt((int)wxSTAY_ON_TOP)); - PyDict_SetItemString(d,"ICONIZE", SWIG_FromInt((int)wxICONIZE)); - PyDict_SetItemString(d,"MINIMIZE", SWIG_FromInt((int)wxMINIMIZE)); - PyDict_SetItemString(d,"MAXIMIZE", SWIG_FromInt((int)wxMAXIMIZE)); - PyDict_SetItemString(d,"CLOSE_BOX", SWIG_FromInt((int)wxCLOSE_BOX)); - PyDict_SetItemString(d,"THICK_FRAME", SWIG_FromInt((int)wxTHICK_FRAME)); - PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_FromInt((int)wxSYSTEM_MENU)); - PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_FromInt((int)wxMINIMIZE_BOX)); - PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_FromInt((int)wxMAXIMIZE_BOX)); - PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_FromInt((int)wxTINY_CAPTION_HORIZ)); - PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_FromInt((int)wxTINY_CAPTION_VERT)); - PyDict_SetItemString(d,"RESIZE_BOX", SWIG_FromInt((int)wxRESIZE_BOX)); - PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_FromInt((int)wxRESIZE_BORDER)); - PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_FromInt((int)wxDIALOG_MODAL)); - PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_FromInt((int)wxDIALOG_MODELESS)); - PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_FromInt((int)wxDIALOG_NO_PARENT)); - PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_FromInt((int)wxDEFAULT_FRAME_STYLE)); - PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_FromInt((int)wxDEFAULT_DIALOG_STYLE)); - PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_FromInt((int)wxFRAME_TOOL_WINDOW)); - PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_FromInt((int)wxFRAME_FLOAT_ON_PARENT)); - PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_FromInt((int)wxFRAME_NO_WINDOW_MENU)); - PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_FromInt((int)wxFRAME_NO_TASKBAR)); - PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_FromInt((int)wxFRAME_SHAPED)); PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_FromInt((int)wxED_CLIENT_MARGIN)); PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_FromInt((int)wxED_BUTTONS_BOTTOM)); PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_FromInt((int)wxED_BUTTONS_RIGHT)); diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 30da66d3fe..ac5ff3d7ad 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -51,13 +51,13 @@ class Colour(core.Object): etc. Valid RGB values are in the range 0 to 255. In wxPython there are typemaps that will automatically convert from a colour - name, or from a "#RRGGBB" colour hex value string to a wx.Colour object when + name, or from a '#RRGGBB' colour hex value string to a wx.Colour object when calling C++ methods that expect a wxColour. This means that the following are all equivallent: win.SetBackgroundColour(wxColour(0,0,255)) - win.SetBackgroundColour("BLUE") - win.SetBackgroundColour("#0000FF") + win.SetBackgroundColour('BLUE') + win.SetBackgroundColour('#0000FF') You can retrieve the various current system colour settings with wx.SystemSettings.GetColour. @@ -482,6 +482,14 @@ class Bitmap(GDIObject): """ return _gdi.Bitmap_GetDepth(*args, **kwargs) + def GetSize(*args, **kwargs): + """ + GetSize() -> Size + + Get the size of the bitmap. + """ + return _gdi.Bitmap_GetSize(*args, **kwargs) + def ConvertToImage(*args, **kwargs): """ ConvertToImage() -> Image @@ -570,6 +578,14 @@ class Bitmap(GDIObject): """ return _gdi.Bitmap_SetDepth(*args, **kwargs) + def SetSize(*args, **kwargs): + """ + SetSize(Size size) + + Set the bitmap size + """ + return _gdi.Bitmap_SetSize(*args, **kwargs) + def __nonzero__(self): return self.Ok() def __eq__(*args, **kwargs): """__eq__(Bitmap other) -> bool""" @@ -587,18 +603,6 @@ class BitmapPtr(Bitmap): self.__class__ = Bitmap _gdi.Bitmap_swigregister(BitmapPtr) -def EmptyBitmap(*args, **kwargs): - """ - EmptyBitmap(int width, int height, int depth=-1) -> Bitmap - - Creates a new bitmap of the given size. A depth of -1 indicates the depth of - the current screen or visual. Some platforms only support 1 for monochrome and - -1 for the current colour setting. - """ - val = _gdi.new_EmptyBitmap(*args, **kwargs) - val.thisown = 1 - return val - def BitmapFromIcon(*args, **kwargs): """ BitmapFromIcon(Icon icon) -> Bitmap @@ -645,6 +649,19 @@ def BitmapFromBits(*args, **kwargs): val.thisown = 1 return val +def EmptyBitmap(*args): + """ + EmptyBitmap(int width, int height, int depth=-1) -> Bitmap + EmptyBitmap(Size size, int depth=-1) -> Bitmap + + Creates a new bitmap of the given size. A depth of -1 indicates + the depth of the current screen or visual. Some platforms only + support 1 for monochrome and -1 for the current colour setting. + """ + val = _gdi.new_EmptyBitmap(*args) + val.thisown = 1 + return val + class Mask(core.Object): """ This class encapsulates a monochrome mask bitmap, where the masked area is @@ -1171,6 +1188,7 @@ FONTENCODING_ISO8859_14 = _gdi.FONTENCODING_ISO8859_14 FONTENCODING_ISO8859_15 = _gdi.FONTENCODING_ISO8859_15 FONTENCODING_ISO8859_MAX = _gdi.FONTENCODING_ISO8859_MAX FONTENCODING_KOI8 = _gdi.FONTENCODING_KOI8 +FONTENCODING_KOI8_U = _gdi.FONTENCODING_KOI8_U FONTENCODING_ALTERNATIVE = _gdi.FONTENCODING_ALTERNATIVE FONTENCODING_BULGARIAN = _gdi.FONTENCODING_BULGARIAN FONTENCODING_CP437 = _gdi.FONTENCODING_CP437 @@ -1449,6 +1467,11 @@ class FontMapper(object): return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs) GetEncodingDescription = staticmethod(GetEncodingDescription) + def GetEncodingFromName(*args, **kwargs): + """GetEncodingFromName(String name) -> int""" + return _gdi.FontMapper_GetEncodingFromName(*args, **kwargs) + + GetEncodingFromName = staticmethod(GetEncodingFromName) def SetConfig(*args, **kwargs): """SetConfig(ConfigBase config)""" return _gdi.FontMapper_SetConfig(*args, **kwargs) @@ -1510,6 +1533,10 @@ def FontMapper_GetEncodingDescription(*args, **kwargs): """FontMapper_GetEncodingDescription(int encoding) -> String""" return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs) +def FontMapper_GetEncodingFromName(*args, **kwargs): + """FontMapper_GetEncodingFromName(String name) -> int""" + return _gdi.FontMapper_GetEncodingFromName(*args, **kwargs) + def FontMapper_GetDefaultConfigPath(*args, **kwargs): """FontMapper_GetDefaultConfigPath() -> String""" return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs) diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp index 8e46b5aa23..67f267865d 100644 --- a/wxPython/src/gtk/gdi_wrap.cpp +++ b/wxPython/src/gtk/gdi_wrap.cpp @@ -218,9 +218,9 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxImage swig_types[9] #define SWIGTYPE_p_wxMetaFileDC swig_types[10] #define SWIGTYPE_p_wxMask swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxWindow swig_types[13] -#define SWIGTYPE_p_wxSize swig_types[14] +#define SWIGTYPE_p_wxSize swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxWindow swig_types[14] #define SWIGTYPE_p_double swig_types[15] #define SWIGTYPE_p_wxMemoryDC swig_types[16] #define SWIGTYPE_p_wxFontMapper swig_types[17] @@ -246,8 +246,8 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxIcon swig_types[37] #define SWIGTYPE_p_wxLocale swig_types[38] #define SWIGTYPE_p_wxRegion swig_types[39] -#define SWIGTYPE_p_wxLanguageInfo swig_types[40] -#define SWIGTYPE_p_wxConfigBase swig_types[41] +#define SWIGTYPE_p_wxConfigBase swig_types[40] +#define SWIGTYPE_p_wxLanguageInfo swig_types[41] #define SWIGTYPE_p_wxWindowDC swig_types[42] #define SWIGTYPE_p_wxPrintData swig_types[43] #define SWIGTYPE_p_wxBrushList swig_types[44] @@ -600,10 +600,24 @@ wxBitmap *new_wxBitmap(PyObject *bits,int width,int height,int depth){ PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } +wxBitmap *new_wxBitmap__SWIG_0(int width,int height,int depth){ + return new wxBitmap(width, height, depth); + } +wxBitmap *new_wxBitmap__SWIG_1(wxSize const &size,int depth){ + return new wxBitmap(size.x, size.y, depth); + } +wxSize wxBitmap_GetSize(wxBitmap *self){ + wxSize size(self->GetWidth(), self->GetHeight()); + return size; + } void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){ wxMask *mask = new wxMask(*self, colour); self->SetMask(mask); } +void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){ + self->SetWidth(size.x); + self->SetHeight(size.y); + } bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : False; } bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : True; } wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){ @@ -2768,42 +2782,6 @@ static PyObject *_wrap_delete_Bitmap(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - int arg1 ; - int arg2 ; - int arg3 = (int) -1 ; - wxBitmap *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "width",(char *) "height",(char *) "depth", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail; - arg1 = (int) SWIG_AsInt(obj0); - if (PyErr_Occurred()) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; - if (obj2) { - arg3 = (int) SWIG_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBitmap *)new wxBitmap(arg1,arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxIcon *arg1 = 0 ; @@ -2936,6 +2914,117 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje } +static PyObject *_wrap_new_EmptyBitmap__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + int arg1 ; + int arg2 ; + int arg3 = (int) -1 ; + wxBitmap *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_EmptyBitmap",&obj0,&obj1,&obj2)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBitmap *)new_wxBitmap__SWIG_0(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_EmptyBitmap__SWIG_1(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSize *arg1 = 0 ; + int arg2 = (int) -1 ; + wxBitmap *result; + wxSize temp1 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:new_EmptyBitmap",&obj0,&obj1)) goto fail; + { + arg1 = &temp1; + if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxBitmap *)new_wxBitmap__SWIG_1((wxSize const &)*arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 3); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 1) && (argc <= 2)) { + int _v; + { + _v = wxPySimple_typecheck(argv[0], wxT("wxSize"), 2); + } + if (_v) { + if (argc <= 1) { + return _wrap_new_EmptyBitmap__SWIG_1(self,args); + } + _v = SWIG_CheckInt(argv[1]); + if (_v) { + return _wrap_new_EmptyBitmap__SWIG_1(self,args); + } + } + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + _v = SWIG_CheckInt(argv[0]); + if (_v) { + _v = SWIG_CheckInt(argv[1]); + if (_v) { + if (argc <= 2) { + return _wrap_new_EmptyBitmap__SWIG_0(self,args); + } + _v = SWIG_CheckInt(argv[2]); + if (_v) { + return _wrap_new_EmptyBitmap__SWIG_0(self,args); + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_EmptyBitmap'"); + return NULL; +} + + static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -3042,6 +3131,36 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Bitmap_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxSize result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetSize",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxBitmap_GetSize(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxSize * resultptr; + resultptr = new wxSize((wxSize &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -3422,6 +3541,38 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Bitmap_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxBitmap *arg1 = (wxBitmap *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetSize",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxBitmap_SetSize(arg1,(wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -7239,6 +7390,44 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec } +static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxString *arg1 = 0 ; + int result; + bool temp1 = False ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingFromName",kwnames,&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)wxFontMapper::GetEncodingFromName((wxString const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + { + if (temp1) + delete arg1; + } + return resultobj; + fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + static PyObject *_wrap_FontMapper_SetConfig(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFontMapper *arg1 = (wxFontMapper *) 0 ; @@ -18131,15 +18320,16 @@ static PyMethodDef SwigMethods[] = { { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS }, { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_Bitmap", (PyCFunction) _wrap_delete_Bitmap, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_EmptyBitmap", (PyCFunction) _wrap_new_EmptyBitmap, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromIcon", (PyCFunction) _wrap_new_BitmapFromIcon, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromImage", (PyCFunction) _wrap_new_BitmapFromImage, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromXPMData", (PyCFunction) _wrap_new_BitmapFromXPMData, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_BitmapFromBits", (PyCFunction) _wrap_new_BitmapFromBits, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_EmptyBitmap", _wrap_new_EmptyBitmap, METH_VARARGS }, { (char *)"Bitmap_Ok", (PyCFunction) _wrap_Bitmap_Ok, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetWidth", (PyCFunction) _wrap_Bitmap_GetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetHeight", (PyCFunction) _wrap_Bitmap_GetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetDepth", (PyCFunction) _wrap_Bitmap_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Bitmap_GetSize", (PyCFunction) _wrap_Bitmap_GetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_ConvertToImage", (PyCFunction) _wrap_Bitmap_ConvertToImage, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_GetMask", (PyCFunction) _wrap_Bitmap_GetMask, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_SetMask", (PyCFunction) _wrap_Bitmap_SetMask, METH_VARARGS | METH_KEYWORDS }, @@ -18151,6 +18341,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetHeight", (PyCFunction) _wrap_Bitmap_SetHeight, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS }, @@ -18279,6 +18470,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"FontMapper_GetEncoding", (PyCFunction) _wrap_FontMapper_GetEncoding, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontMapper_GetEncodingName", (PyCFunction) _wrap_FontMapper_GetEncodingName, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontMapper_GetEncodingDescription", (PyCFunction) _wrap_FontMapper_GetEncodingDescription, METH_VARARGS | METH_KEYWORDS }, + { (char *)"FontMapper_GetEncodingFromName", (PyCFunction) _wrap_FontMapper_GetEncodingFromName, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontMapper_SetConfig", (PyCFunction) _wrap_FontMapper_SetConfig, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontMapper_SetConfigPath", (PyCFunction) _wrap_FontMapper_SetConfigPath, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontMapper_GetDefaultConfigPath", (PyCFunction) _wrap_FontMapper_GetDefaultConfigPath, METH_VARARGS | METH_KEYWORDS }, @@ -18999,9 +19191,9 @@ static swig_type_info _swigt__p_wxIconLocation[] = {{"_p_wxIconLocation", 0, "wx static swig_type_info _swigt__p_wxImage[] = {{"_p_wxImage", 0, "wxImage *", 0, 0, 0, 0},{"_p_wxImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMetaFileDC[] = {{"_p_wxMetaFileDC", 0, "wxMetaFileDC *", 0, 0, 0, 0},{"_p_wxMetaFileDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMask[] = {{"_p_wxMask", 0, "wxMask *", 0, 0, 0, 0},{"_p_wxMask", 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_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 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_double[] = {{"_p_double", 0, "double *", 0, 0, 0, 0},{"_p_double", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0, 0, 0, 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxMemoryDC, 0, 0, 0, 0, 0},{"_p_wxMemoryDC", 0, 0, 0, 0, 0, 0},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxMemoryDC, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFontMapper[] = {{"_p_wxFontMapper", 0, "wxFontMapper *", 0, 0, 0, 0},{"_p_wxFontMapper", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -19027,8 +19219,8 @@ static swig_type_info _swigt__p_wxGDIObject[] = {{"_p_wxGDIObject", 0, "wxGDIObj static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0, 0, 0, 0},{"_p_wxIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLocale[] = {{"_p_wxLocale", 0, "wxLocale *", 0, 0, 0, 0},{"_p_wxLocale", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0, 0, 0, 0},{"_p_wxRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0, 0, 0, 0},{"_p_wxLanguageInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0, 0, 0, 0},{"_p_wxConfigBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxLanguageInfo[] = {{"_p_wxLanguageInfo", 0, "wxLanguageInfo *", 0, 0, 0, 0},{"_p_wxLanguageInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxWindowDC[] = {{"_p_wxWindowDC", 0, "wxWindowDC *", 0, 0, 0, 0},{"_p_wxWindowDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBrushList[] = {{"_p_wxBrushList", 0, "wxBrushList *", 0, 0, 0, 0},{"_p_wxBrushList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -19057,9 +19249,9 @@ _swigt__p_wxIconLocation, _swigt__p_wxImage, _swigt__p_wxMetaFileDC, _swigt__p_wxMask, +_swigt__p_wxSize, _swigt__p_wxFont, _swigt__p_wxWindow, -_swigt__p_wxSize, _swigt__p_double, _swigt__p_wxMemoryDC, _swigt__p_wxFontMapper, @@ -19085,8 +19277,8 @@ _swigt__p_wxGDIObject, _swigt__p_wxIcon, _swigt__p_wxLocale, _swigt__p_wxRegion, -_swigt__p_wxLanguageInfo, _swigt__p_wxConfigBase, +_swigt__p_wxLanguageInfo, _swigt__p_wxWindowDC, _swigt__p_wxPrintData, _swigt__p_wxBrushList, @@ -19183,6 +19375,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_FromInt((int)wxFONTENCODING_ISO8859_15)); PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_FromInt((int)wxFONTENCODING_ISO8859_MAX)); PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_FromInt((int)wxFONTENCODING_KOI8)); + PyDict_SetItemString(d,"FONTENCODING_KOI8_U", SWIG_FromInt((int)wxFONTENCODING_KOI8_U)); PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_FromInt((int)wxFONTENCODING_ALTERNATIVE)); PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_FromInt((int)wxFONTENCODING_BULGARIAN)); PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_FromInt((int)wxFONTENCODING_CP437)); diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py index 259d15e93c..54276f6831 100644 --- a/wxPython/src/gtk/grid.py +++ b/wxPython/src/gtk/grid.py @@ -447,7 +447,7 @@ class GridCellFloatEditor(GridCellTextEditor): def __repr__(self): return "<%s.%s; proxy of C++ wxGridCellFloatEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> GridCellFloatEditor""" + """__init__(int width=-1, int precision=-1) -> GridCellFloatEditor""" newobj = _grid.new_GridCellFloatEditor(*args, **kwargs) self.this = newobj.this self.thisown = 1 diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index 48f22d5dda..d76412fb92 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -3416,15 +3416,27 @@ static PyObject * GridCellNumberEditor_swigregister(PyObject *self, PyObject *ar } static PyObject *_wrap_new_GridCellFloatEditor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; + int arg1 = (int) -1 ; + int arg2 = (int) -1 ; wxGridCellFloatEditor *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - NULL + (char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_GridCellFloatEditor",kwnames)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatEditor",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGridCellFloatEditor *)new wxGridCellFloatEditor(); + result = (wxGridCellFloatEditor *)new wxGridCellFloatEditor(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py index 0441380434..fa34642be6 100644 --- a/wxPython/src/gtk/windows.py +++ b/wxPython/src/gtk/windows.py @@ -187,6 +187,27 @@ def PreScrolledWindow(*args, **kwargs): #--------------------------------------------------------------------------- +STAY_ON_TOP = _windows.STAY_ON_TOP +ICONIZE = _windows.ICONIZE +MINIMIZE = _windows.MINIMIZE +MAXIMIZE = _windows.MAXIMIZE +CLOSE_BOX = _windows.CLOSE_BOX +THICK_FRAME = _windows.THICK_FRAME +SYSTEM_MENU = _windows.SYSTEM_MENU +MINIMIZE_BOX = _windows.MINIMIZE_BOX +MAXIMIZE_BOX = _windows.MAXIMIZE_BOX +TINY_CAPTION_HORIZ = _windows.TINY_CAPTION_HORIZ +TINY_CAPTION_VERT = _windows.TINY_CAPTION_VERT +RESIZE_BOX = _windows.RESIZE_BOX +RESIZE_BORDER = _windows.RESIZE_BORDER +DIALOG_NO_PARENT = _windows.DIALOG_NO_PARENT +DEFAULT_FRAME_STYLE = _windows.DEFAULT_FRAME_STYLE +DEFAULT_DIALOG_STYLE = _windows.DEFAULT_DIALOG_STYLE +FRAME_TOOL_WINDOW = _windows.FRAME_TOOL_WINDOW +FRAME_FLOAT_ON_PARENT = _windows.FRAME_FLOAT_ON_PARENT +FRAME_NO_WINDOW_MENU = _windows.FRAME_NO_WINDOW_MENU +FRAME_NO_TASKBAR = _windows.FRAME_NO_TASKBAR +FRAME_SHAPED = _windows.FRAME_SHAPED FULLSCREEN_NOMENUBAR = _windows.FULLSCREEN_NOMENUBAR FULLSCREEN_NOTOOLBAR = _windows.FULLSCREEN_NOTOOLBAR FULLSCREEN_NOSTATUSBAR = _windows.FULLSCREEN_NOSTATUSBAR diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp index 04d7f53ec6..575f48cbc6 100644 --- a/wxPython/src/gtk/windows_wrap.cpp +++ b/wxPython/src/gtk/windows_wrap.cpp @@ -26196,6 +26196,27 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"DialogNameStr",_wrap_DialogNameStr_get, _wrap_DialogNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"StatusLineNameStr",_wrap_StatusLineNameStr_get, _wrap_StatusLineNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"ToolBarNameStr",_wrap_ToolBarNameStr_get, _wrap_ToolBarNameStr_set); + PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_FromInt((int)wxSTAY_ON_TOP)); + PyDict_SetItemString(d,"ICONIZE", SWIG_FromInt((int)wxICONIZE)); + PyDict_SetItemString(d,"MINIMIZE", SWIG_FromInt((int)wxMINIMIZE)); + PyDict_SetItemString(d,"MAXIMIZE", SWIG_FromInt((int)wxMAXIMIZE)); + PyDict_SetItemString(d,"CLOSE_BOX", SWIG_FromInt((int)wxCLOSE_BOX)); + PyDict_SetItemString(d,"THICK_FRAME", SWIG_FromInt((int)wxTHICK_FRAME)); + PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_FromInt((int)wxSYSTEM_MENU)); + PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_FromInt((int)wxMINIMIZE_BOX)); + PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_FromInt((int)wxMAXIMIZE_BOX)); + PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_FromInt((int)wxTINY_CAPTION_HORIZ)); + PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_FromInt((int)wxTINY_CAPTION_VERT)); + PyDict_SetItemString(d,"RESIZE_BOX", SWIG_FromInt((int)wxRESIZE_BOX)); + PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_FromInt((int)wxRESIZE_BORDER)); + PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_FromInt((int)wxDIALOG_NO_PARENT)); + PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_FromInt((int)wxDEFAULT_FRAME_STYLE)); + PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_FromInt((int)wxDEFAULT_DIALOG_STYLE)); + PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_FromInt((int)wxFRAME_TOOL_WINDOW)); + PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_FromInt((int)wxFRAME_FLOAT_ON_PARENT)); + PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_FromInt((int)wxFRAME_NO_WINDOW_MENU)); + PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_FromInt((int)wxFRAME_NO_TASKBAR)); + PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_FromInt((int)wxFRAME_SHAPED)); PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_FromInt((int)wxFULLSCREEN_NOMENUBAR)); PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_FromInt((int)wxFULLSCREEN_NOTOOLBAR)); PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_FromInt((int)wxFULLSCREEN_NOSTATUSBAR)); diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py index 507b5cc74f..c824c2a85b 100644 --- a/wxPython/wxPython/core.py +++ b/wxPython/wxPython/core.py @@ -31,37 +31,12 @@ wxSIMPLE_BORDER = wx.core.SIMPLE_BORDER wxSTATIC_BORDER = wx.core.STATIC_BORDER wxTRANSPARENT_WINDOW = wx.core.TRANSPARENT_WINDOW wxNO_BORDER = wx.core.NO_BORDER -wxUSER_COLOURS = wx.core.USER_COLOURS -wxNO_3D = wx.core.NO_3D wxTAB_TRAVERSAL = wx.core.TAB_TRAVERSAL wxWANTS_CHARS = wx.core.WANTS_CHARS 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 -wxSTAY_ON_TOP = wx.core.STAY_ON_TOP -wxICONIZE = wx.core.ICONIZE -wxMINIMIZE = wx.core.MINIMIZE -wxMAXIMIZE = wx.core.MAXIMIZE -wxCLOSE_BOX = wx.core.CLOSE_BOX -wxTHICK_FRAME = wx.core.THICK_FRAME -wxSYSTEM_MENU = wx.core.SYSTEM_MENU -wxMINIMIZE_BOX = wx.core.MINIMIZE_BOX -wxMAXIMIZE_BOX = wx.core.MAXIMIZE_BOX -wxTINY_CAPTION_HORIZ = wx.core.TINY_CAPTION_HORIZ -wxTINY_CAPTION_VERT = wx.core.TINY_CAPTION_VERT -wxRESIZE_BOX = wx.core.RESIZE_BOX -wxRESIZE_BORDER = wx.core.RESIZE_BORDER -wxDIALOG_MODAL = wx.core.DIALOG_MODAL -wxDIALOG_MODELESS = wx.core.DIALOG_MODELESS -wxDIALOG_NO_PARENT = wx.core.DIALOG_NO_PARENT -wxDEFAULT_FRAME_STYLE = wx.core.DEFAULT_FRAME_STYLE -wxDEFAULT_DIALOG_STYLE = wx.core.DEFAULT_DIALOG_STYLE -wxFRAME_TOOL_WINDOW = wx.core.FRAME_TOOL_WINDOW -wxFRAME_FLOAT_ON_PARENT = wx.core.FRAME_FLOAT_ON_PARENT -wxFRAME_NO_WINDOW_MENU = wx.core.FRAME_NO_WINDOW_MENU -wxFRAME_NO_TASKBAR = wx.core.FRAME_NO_TASKBAR -wxFRAME_SHAPED = wx.core.FRAME_SHAPED wxED_CLIENT_MARGIN = wx.core.ED_CLIENT_MARGIN wxED_BUTTONS_BOTTOM = wx.core.ED_BUTTONS_BOTTOM wxED_BUTTONS_RIGHT = wx.core.ED_BUTTONS_RIGHT @@ -669,6 +644,7 @@ wxImageFromMime = wx.core.ImageFromMime wxImageFromStream = wx.core.ImageFromStream wxImageFromStreamMime = wx.core.ImageFromStreamMime wxEmptyImage = wx.core.EmptyImage +wxEmptyImage = wx.core.EmptyImage wxImageFromBitmap = wx.core.ImageFromBitmap wxImageFromData = wx.core.ImageFromData wxImage_CanRead = wx.core.Image_CanRead diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py index 53f6d7bf6e..65bc00c752 100644 --- a/wxPython/wxPython/gdi.py +++ b/wxPython/wxPython/gdi.py @@ -35,11 +35,12 @@ wxBrush = wx.gdi.Brush wxBrushPtr = wx.gdi.BrushPtr wxBitmap = wx.gdi.Bitmap wxBitmapPtr = wx.gdi.BitmapPtr -wxEmptyBitmap = wx.gdi.EmptyBitmap wxBitmapFromIcon = wx.gdi.BitmapFromIcon wxBitmapFromImage = wx.gdi.BitmapFromImage wxBitmapFromXPMData = wx.gdi.BitmapFromXPMData wxBitmapFromBits = wx.gdi.BitmapFromBits +wxEmptyBitmap = wx.gdi.EmptyBitmap +wxEmptyBitmap = wx.gdi.EmptyBitmap wxMask = wx.gdi.Mask wxMaskPtr = wx.gdi.MaskPtr wxIcon = wx.gdi.Icon @@ -113,6 +114,7 @@ wxFONTENCODING_ISO8859_14 = wx.gdi.FONTENCODING_ISO8859_14 wxFONTENCODING_ISO8859_15 = wx.gdi.FONTENCODING_ISO8859_15 wxFONTENCODING_ISO8859_MAX = wx.gdi.FONTENCODING_ISO8859_MAX wxFONTENCODING_KOI8 = wx.gdi.FONTENCODING_KOI8 +wxFONTENCODING_KOI8_U = wx.gdi.FONTENCODING_KOI8_U wxFONTENCODING_ALTERNATIVE = wx.gdi.FONTENCODING_ALTERNATIVE wxFONTENCODING_BULGARIAN = wx.gdi.FONTENCODING_BULGARIAN wxFONTENCODING_CP437 = wx.gdi.FONTENCODING_CP437 @@ -204,6 +206,7 @@ wxFontMapper_GetSupportedEncodingsCount = wx.gdi.FontMapper_GetSupportedEncoding wxFontMapper_GetEncoding = wx.gdi.FontMapper_GetEncoding wxFontMapper_GetEncodingName = wx.gdi.FontMapper_GetEncodingName wxFontMapper_GetEncodingDescription = wx.gdi.FontMapper_GetEncodingDescription +wxFontMapper_GetEncodingFromName = wx.gdi.FontMapper_GetEncodingFromName wxFontMapper_GetDefaultConfigPath = wx.gdi.FontMapper_GetDefaultConfigPath wxFont = wx.gdi.Font wxFontPtr = wx.gdi.FontPtr diff --git a/wxPython/wxPython/windows.py b/wxPython/wxPython/windows.py index e761ec27bb..cd804b31d3 100644 --- a/wxPython/wxPython/windows.py +++ b/wxPython/wxPython/windows.py @@ -29,6 +29,27 @@ wxFrameNameStr = wx.windows.FrameNameStr wxDialogNameStr = wx.windows.DialogNameStr wxStatusLineNameStr = wx.windows.StatusLineNameStr wxToolBarNameStr = wx.windows.ToolBarNameStr +wxSTAY_ON_TOP = wx.windows.STAY_ON_TOP +wxICONIZE = wx.windows.ICONIZE +wxMINIMIZE = wx.windows.MINIMIZE +wxMAXIMIZE = wx.windows.MAXIMIZE +wxCLOSE_BOX = wx.windows.CLOSE_BOX +wxTHICK_FRAME = wx.windows.THICK_FRAME +wxSYSTEM_MENU = wx.windows.SYSTEM_MENU +wxMINIMIZE_BOX = wx.windows.MINIMIZE_BOX +wxMAXIMIZE_BOX = wx.windows.MAXIMIZE_BOX +wxTINY_CAPTION_HORIZ = wx.windows.TINY_CAPTION_HORIZ +wxTINY_CAPTION_VERT = wx.windows.TINY_CAPTION_VERT +wxRESIZE_BOX = wx.windows.RESIZE_BOX +wxRESIZE_BORDER = wx.windows.RESIZE_BORDER +wxDIALOG_NO_PARENT = wx.windows.DIALOG_NO_PARENT +wxDEFAULT_FRAME_STYLE = wx.windows.DEFAULT_FRAME_STYLE +wxDEFAULT_DIALOG_STYLE = wx.windows.DEFAULT_DIALOG_STYLE +wxFRAME_TOOL_WINDOW = wx.windows.FRAME_TOOL_WINDOW +wxFRAME_FLOAT_ON_PARENT = wx.windows.FRAME_FLOAT_ON_PARENT +wxFRAME_NO_WINDOW_MENU = wx.windows.FRAME_NO_WINDOW_MENU +wxFRAME_NO_TASKBAR = wx.windows.FRAME_NO_TASKBAR +wxFRAME_SHAPED = wx.windows.FRAME_SHAPED wxFULLSCREEN_NOMENUBAR = wx.windows.FULLSCREEN_NOMENUBAR wxFULLSCREEN_NOTOOLBAR = wx.windows.FULLSCREEN_NOTOOLBAR wxFULLSCREEN_NOSTATUSBAR = wx.windows.FULLSCREEN_NOSTATUSBAR -- 2.47.2