mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-20 21:08:24 +08:00
reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
+410
-551
File diff suppressed because it is too large
Load Diff
+262
-393
File diff suppressed because it is too large
Load Diff
@@ -26949,7 +26949,7 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj
|
||||
PyObject * obj4 = 0 ;
|
||||
PyObject * obj5 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self",(char *) "orientation",(char *) "pos",(char *) "thumbvisible",(char *) "range",(char *) "refresh", NULL
|
||||
(char *) "self",(char *) "orientation",(char *) "position",(char *) "thumbSize",(char *) "range",(char *) "refresh", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
|
||||
|
||||
+51
-128
@@ -46,29 +46,35 @@ _gdi_.GDIObject_swigregister(GDIObjectPtr)
|
||||
|
||||
class Colour(_core.Object):
|
||||
"""
|
||||
A colour is an object representing a combination of Red, Green, and Blue (RGB)
|
||||
intensity values, and is used to determine drawing colours, window colours,
|
||||
etc. Valid RGB values are in the range 0 to 255.
|
||||
A colour is an object representing a combination of Red, Green, and
|
||||
Blue (RGB) intensity values, and is used to determine drawing colours,
|
||||
window colours, 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
|
||||
calling C++ methods that expect a wxColour. This means that the following are
|
||||
all equivallent:
|
||||
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 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')
|
||||
|
||||
You can retrieve the various current system colour settings with
|
||||
wx.SystemSettings.GetColour.
|
||||
Additional colour names and their coresponding values can be added
|
||||
using `wx.ColourDatabase`. Various system colours (as set in the
|
||||
user's system preferences) can be retrieved with
|
||||
`wx.SystemSettings.GetColour`.
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(self, unsigned char red=0, unsigned char green=0, unsigned char blue=0) -> Colour
|
||||
__init__(self, byte red=0, byte green=0, byte blue=0) -> Colour
|
||||
|
||||
Constructs a colour from red, green and blue values.
|
||||
|
||||
:see: Alternate constructors `wx.NamedColour` and `wx.ColourRGB`.
|
||||
|
||||
"""
|
||||
newobj = _gdi_.new_Colour(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
@@ -82,7 +88,7 @@ class Colour(_core.Object):
|
||||
|
||||
def Red(*args, **kwargs):
|
||||
"""
|
||||
Red(self) -> unsigned char
|
||||
Red(self) -> byte
|
||||
|
||||
Returns the red intensity.
|
||||
"""
|
||||
@@ -90,7 +96,7 @@ class Colour(_core.Object):
|
||||
|
||||
def Green(*args, **kwargs):
|
||||
"""
|
||||
Green(self) -> unsigned char
|
||||
Green(self) -> byte
|
||||
|
||||
Returns the green intensity.
|
||||
"""
|
||||
@@ -98,7 +104,7 @@ class Colour(_core.Object):
|
||||
|
||||
def Blue(*args, **kwargs):
|
||||
"""
|
||||
Blue(self) -> unsigned char
|
||||
Blue(self) -> byte
|
||||
|
||||
Returns the blue intensity.
|
||||
"""
|
||||
@@ -115,7 +121,7 @@ class Colour(_core.Object):
|
||||
|
||||
def Set(*args, **kwargs):
|
||||
"""
|
||||
Set(self, unsigned char red, unsigned char green, unsigned char blue)
|
||||
Set(self, byte red, byte green, byte blue)
|
||||
|
||||
Sets the RGB intensity values.
|
||||
"""
|
||||
@@ -133,7 +139,8 @@ class Colour(_core.Object):
|
||||
"""
|
||||
SetFromName(self, String colourName)
|
||||
|
||||
Sets the RGB intensity values using a colour name listed in wx.TheColourDatabase.
|
||||
Sets the RGB intensity values using a colour name listed in
|
||||
``wx.TheColourDatabase``.
|
||||
"""
|
||||
return _gdi_.Colour_SetFromName(*args, **kwargs)
|
||||
|
||||
@@ -142,8 +149,8 @@ class Colour(_core.Object):
|
||||
GetPixel(self) -> long
|
||||
|
||||
Returns a pixel value which is platform-dependent. On Windows, a
|
||||
COLORREF is returned. On X, an allocated pixel value is returned.
|
||||
-1 is returned if the pixel is invalid (on X, unallocated).
|
||||
COLORREF is returned. On X, an allocated pixel value is returned. -1
|
||||
is returned if the pixel is invalid (on X, unallocated).
|
||||
"""
|
||||
return _gdi_.Colour_GetPixel(*args, **kwargs)
|
||||
|
||||
@@ -179,9 +186,9 @@ class Colour(_core.Object):
|
||||
"""
|
||||
return _gdi_.Colour_GetRGB(*args, **kwargs)
|
||||
|
||||
asTuple = Get
|
||||
def __str__(self): return str(self.asTuple())
|
||||
def __repr__(self): return 'wx.Colour' + str(self.asTuple())
|
||||
asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")
|
||||
def __str__(self): return str(self.Get())
|
||||
def __repr__(self): return 'wx.Colour' + str(self.Get())
|
||||
def __nonzero__(self): return self.Ok()
|
||||
__safe_for_unpickling__ = True
|
||||
def __reduce__(self): return (Colour, self.Get())
|
||||
@@ -198,7 +205,8 @@ def NamedColour(*args, **kwargs):
|
||||
"""
|
||||
NamedColour(String colorName) -> Colour
|
||||
|
||||
Constructs a colour object using a colour name listed in wx.TheColourDatabase.
|
||||
Constructs a colour object using a colour name listed in
|
||||
``wx.TheColourDatabase``.
|
||||
"""
|
||||
val = _gdi_.new_NamedColour(*args, **kwargs)
|
||||
val.thisown = 1
|
||||
@@ -357,18 +365,6 @@ class Brush(GDIObject):
|
||||
A brush is a drawing tool for filling in areas. It is used for
|
||||
painting the background of rectangles, ellipses, etc. when drawing on
|
||||
a `wx.DC`. It has a colour and a style.
|
||||
|
||||
:warning: Do not create instances of wx.Brush before the `wx.App`
|
||||
object has been created because, depending on the platform,
|
||||
required internal data structures may not have been initialized
|
||||
yet. Instead create your brushes in the app's OnInit or as they
|
||||
are needed for drawing.
|
||||
|
||||
:note: On monochrome displays all brushes are white, unless the colour
|
||||
really is black.
|
||||
|
||||
:see: `wx.BrushList`, `wx.DC`, `wx.DC.SetBrush`
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -376,24 +372,7 @@ class Brush(GDIObject):
|
||||
"""
|
||||
__init__(self, Colour colour, int style=SOLID) -> Brush
|
||||
|
||||
Constructs a brush from a `wx.Colour` object and a style. The style
|
||||
parameter may be one of the following:
|
||||
|
||||
=================== =============================
|
||||
Style Meaning
|
||||
=================== =============================
|
||||
wx.TRANSPARENT Transparent (no fill).
|
||||
wx.SOLID Solid.
|
||||
wx.STIPPLE Uses a bitmap as a stipple.
|
||||
wx.BDIAGONAL_HATCH Backward diagonal hatch.
|
||||
wx.CROSSDIAG_HATCH Cross-diagonal hatch.
|
||||
wx.FDIAGONAL_HATCH Forward diagonal hatch.
|
||||
wx.CROSS_HATCH Cross hatch.
|
||||
wx.HORIZONTAL_HATCH Horizontal hatch.
|
||||
wx.VERTICAL_HATCH Vertical hatch.
|
||||
=================== =============================
|
||||
|
||||
|
||||
Constructs a brush from a `wx.Colour` object and a style.
|
||||
"""
|
||||
newobj = _gdi_.new_Brush(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
@@ -489,19 +468,6 @@ class Bitmap(GDIObject):
|
||||
device context (instance of `wx.MemoryDC`). This enables the bitmap to
|
||||
be copied to a window or memory device context using `wx.DC.Blit`, or
|
||||
to be used as a drawing surface.
|
||||
|
||||
The BMP and XMP image file formats are supported on all platforms by
|
||||
wx.Bitmap. Other formats are automatically loaded by `wx.Image` and
|
||||
converted to a wx.Bitmap, so any image file format supported by
|
||||
`wx.Image` can be used.
|
||||
|
||||
:todo: Add wrappers and support for raw bitmap data access. Can this
|
||||
be be put into Python without losing the speed benefits of the
|
||||
teplates and iterators in rawbmp.h?
|
||||
|
||||
:todo: Find a way to do very efficient PIL Image <--> wx.Bitmap
|
||||
converstions.
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -510,33 +476,6 @@ class Bitmap(GDIObject):
|
||||
__init__(self, String name, int type=BITMAP_TYPE_ANY) -> Bitmap
|
||||
|
||||
Loads a bitmap from a file.
|
||||
|
||||
:param name: Name of the file to load the bitmap from.
|
||||
:param type: The type of image to expect. Can be one of the following
|
||||
constants (assuming that the neccessary `wx.Image` handlers are
|
||||
loaded):
|
||||
|
||||
* wx.BITMAP_TYPE_ANY
|
||||
* wx.BITMAP_TYPE_BMP
|
||||
* wx.BITMAP_TYPE_ICO
|
||||
* wx.BITMAP_TYPE_CUR
|
||||
* wx.BITMAP_TYPE_XBM
|
||||
* wx.BITMAP_TYPE_XPM
|
||||
* wx.BITMAP_TYPE_TIF
|
||||
* wx.BITMAP_TYPE_GIF
|
||||
* wx.BITMAP_TYPE_PNG
|
||||
* wx.BITMAP_TYPE_JPEG
|
||||
* wx.BITMAP_TYPE_PNM
|
||||
* wx.BITMAP_TYPE_PCX
|
||||
* wx.BITMAP_TYPE_PICT
|
||||
* wx.BITMAP_TYPE_ICON
|
||||
* wx.BITMAP_TYPE_ANI
|
||||
* wx.BITMAP_TYPE_IFF
|
||||
|
||||
:see: Alternate constructors `wx.EmptyBitmap`, `wx.BitmapFromIcon`,
|
||||
`wx.BitmapFromImage`, `wx.BitmapFromXPMData`,
|
||||
`wx.BitmapFromBits`
|
||||
|
||||
"""
|
||||
newobj = _gdi_.new_Bitmap(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
@@ -777,7 +716,6 @@ class Mask(_core.Object):
|
||||
`wx.DC.DrawBitmap` or `wx.DC.Blit` when the source device context is a
|
||||
`wx.MemoryDC` with a `wx.Bitmap` selected into it that contains a
|
||||
mask.
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -979,15 +917,15 @@ def IconBundleFromIcon(*args, **kwargs):
|
||||
|
||||
class Cursor(GDIObject):
|
||||
"""
|
||||
A cursor is a small bitmap usually used for denoting where the
|
||||
mouse pointer is, with a picture that might indicate the
|
||||
interpretation of a mouse click.
|
||||
A cursor is a small bitmap usually used for denoting where the mouse
|
||||
pointer is, with a picture that might indicate the interpretation of a
|
||||
mouse click.
|
||||
|
||||
A single cursor object may be used in many windows (any subwindow
|
||||
type). The wxWindows convention is to set the cursor for a
|
||||
window, as in X, rather than to set it globally as in MS Windows,
|
||||
although a global wx.SetCursor function is also available for use
|
||||
on MS Windows.
|
||||
type). The wxWindows convention is to set the cursor for a window, as
|
||||
in X, rather than to set it globally as in MS Windows, although a
|
||||
global `wx.SetCursor` function is also available for use on MS Windows.
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -996,11 +934,11 @@ class Cursor(GDIObject):
|
||||
__init__(self, String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -> Cursor
|
||||
|
||||
Construct a Cursor from a file. Specify the type of file using
|
||||
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a
|
||||
.cur file.
|
||||
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a cur
|
||||
file.
|
||||
|
||||
This cursor is not available on wxGTK, use wx.StockCursor,
|
||||
wx.CursorFromImage, or wx.CursorFromBits instead.
|
||||
This constructor is not available on wxGTK, use ``wx.StockCursor``,
|
||||
``wx.CursorFromImage``, or ``wx.CursorFromBits`` instead.
|
||||
"""
|
||||
newobj = _gdi_.new_Cursor(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
@@ -1029,8 +967,8 @@ def StockCursor(*args, **kwargs):
|
||||
"""
|
||||
StockCursor(int id) -> Cursor
|
||||
|
||||
Create a cursor using one of the stock cursors. Note that not
|
||||
all cursors are available on all platforms.
|
||||
Create a cursor using one of the stock cursors. Note that not all
|
||||
cursors are available on all platforms.
|
||||
"""
|
||||
val = _gdi_.new_StockCursor(*args, **kwargs)
|
||||
val.thisown = 1
|
||||
@@ -1040,17 +978,10 @@ def CursorFromImage(*args, **kwargs):
|
||||
"""
|
||||
CursorFromImage(Image image) -> Cursor
|
||||
|
||||
Constructs a cursor from a wxImage. The cursor is monochrome,
|
||||
colors with the RGB elements all greater than 127 will be
|
||||
foreground, colors less than this background. The mask (if any)
|
||||
will be used as transparent.
|
||||
|
||||
In MSW the foreground will be white and the background black. The
|
||||
cursor is resized to 32x32 In GTK, the two most frequent colors
|
||||
will be used for foreground and background. The cursor will be
|
||||
displayed at the size of the image. On MacOS the cursor is
|
||||
resized to 16x16 and currently only shown as black/white (mask
|
||||
respected).
|
||||
Constructs a cursor from a wxImage. The cursor is monochrome, colors
|
||||
with the RGB elements all greater than 127 will be foreground, colors
|
||||
less than this background. The mask (if any) will be used as
|
||||
transparent.
|
||||
"""
|
||||
val = _gdi_.new_CursorFromImage(*args, **kwargs)
|
||||
val.thisown = 1
|
||||
@@ -2140,7 +2071,7 @@ class Locale(object):
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(self, int language=LANGUAGE_DEFAULT, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> Locale"""
|
||||
"""__init__(self, int language=-1, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> Locale"""
|
||||
newobj = _gdi_.new_Locale(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
@@ -2671,12 +2602,7 @@ class DC(_core.Object):
|
||||
return _gdi_.DC_GetCharWidth(*args, **kwargs)
|
||||
|
||||
def GetTextExtent(*args, **kwargs):
|
||||
"""
|
||||
GetTextExtent(wxString string) -> (width, height)
|
||||
|
||||
Get the width and height of the text using the current font.
|
||||
Only works for single line strings.
|
||||
"""
|
||||
"""GetTextExtent(wxString string) -> (width, height)"""
|
||||
return _gdi_.DC_GetTextExtent(*args, **kwargs)
|
||||
|
||||
def GetFullTextExtent(*args, **kwargs):
|
||||
@@ -2684,8 +2610,8 @@ class DC(_core.Object):
|
||||
GetFullTextExtent(wxString string, Font font=None) ->
|
||||
(width, height, descent, externalLeading)
|
||||
|
||||
Get the width, height, decent and leading of the text using the current or specified font.
|
||||
Only works for single line strings.
|
||||
Get the width, height, decent and leading of the text using the
|
||||
current or specified font. Only works for single line strings.
|
||||
"""
|
||||
return _gdi_.DC_GetFullTextExtent(*args, **kwargs)
|
||||
|
||||
@@ -2693,9 +2619,6 @@ class DC(_core.Object):
|
||||
"""
|
||||
GetMultiLineTextExtent(wxString string, Font font=None) ->
|
||||
(width, height, descent, externalLeading)
|
||||
|
||||
Get the width, height, decent and leading of the text using the current or specified font.
|
||||
Works for single as well as multi-line strings.
|
||||
"""
|
||||
return _gdi_.DC_GetMultiLineTextExtent(*args, **kwargs)
|
||||
|
||||
|
||||
@@ -777,6 +777,12 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
|
||||
}
|
||||
|
||||
|
||||
wxLocale *new_wxLocale(int language,int flags){
|
||||
if (language == -1)
|
||||
return new wxLocale();
|
||||
else
|
||||
return new wxLocale(language, flags);
|
||||
}
|
||||
|
||||
#include "wx/wxPython/pydrawxxx.h"
|
||||
|
||||
@@ -1029,9 +1035,9 @@ static PyObject * GDIObject_swigregister(PyObject *self, PyObject *args) {
|
||||
}
|
||||
static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
unsigned char arg1 = (unsigned char) 0 ;
|
||||
unsigned char arg2 = (unsigned char) 0 ;
|
||||
unsigned char arg3 = (unsigned char) 0 ;
|
||||
byte arg1 = (byte) 0 ;
|
||||
byte arg2 = (byte) 0 ;
|
||||
byte arg3 = (byte) 0 ;
|
||||
wxColour *result;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
@@ -1042,15 +1048,15 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Colour",kwnames,&obj0,&obj1,&obj2)) goto fail;
|
||||
if (obj0) {
|
||||
arg1 = (unsigned char) SWIG_AsUnsignedChar(obj0);
|
||||
arg1 = (byte) SWIG_AsUnsignedChar(obj0);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
if (obj1) {
|
||||
arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1);
|
||||
arg2 = (byte) SWIG_AsUnsignedChar(obj1);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
if (obj2) {
|
||||
arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2);
|
||||
arg3 = (byte) SWIG_AsUnsignedChar(obj2);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
{
|
||||
@@ -1159,7 +1165,7 @@ static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *k
|
||||
static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxColour *arg1 = (wxColour *) 0 ;
|
||||
unsigned char result;
|
||||
byte result;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self", NULL
|
||||
@@ -1170,7 +1176,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar
|
||||
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (unsigned char)(arg1)->Red();
|
||||
result = (byte)(arg1)->Red();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
@@ -1185,7 +1191,7 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar
|
||||
static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxColour *arg1 = (wxColour *) 0 ;
|
||||
unsigned char result;
|
||||
byte result;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self", NULL
|
||||
@@ -1196,7 +1202,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw
|
||||
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (unsigned char)(arg1)->Green();
|
||||
result = (byte)(arg1)->Green();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
@@ -1211,7 +1217,7 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw
|
||||
static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxColour *arg1 = (wxColour *) 0 ;
|
||||
unsigned char result;
|
||||
byte result;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self", NULL
|
||||
@@ -1222,7 +1228,7 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa
|
||||
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (unsigned char)(arg1)->Blue();
|
||||
result = (byte)(arg1)->Blue();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
@@ -1265,9 +1271,9 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg
|
||||
static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxColour *arg1 = (wxColour *) 0 ;
|
||||
unsigned char arg2 ;
|
||||
unsigned char arg3 ;
|
||||
unsigned char arg4 ;
|
||||
byte arg2 ;
|
||||
byte arg3 ;
|
||||
byte arg4 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
PyObject * obj2 = 0 ;
|
||||
@@ -1279,11 +1285,11 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Colour_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
|
||||
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
|
||||
arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1);
|
||||
arg2 = (byte) SWIG_AsUnsignedChar(obj1);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2);
|
||||
arg3 = (byte) SWIG_AsUnsignedChar(obj2);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3);
|
||||
arg4 = (byte) SWIG_AsUnsignedChar(obj3);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
@@ -8992,7 +8998,7 @@ static PyObject * LanguageInfo_swigregister(PyObject *self, PyObject *args) {
|
||||
}
|
||||
static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
int arg1 = (int) wxLANGUAGE_DEFAULT ;
|
||||
int arg1 = (int) -1 ;
|
||||
int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
|
||||
wxLocale *result;
|
||||
PyObject * obj0 = 0 ;
|
||||
@@ -9012,7 +9018,7 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (wxLocale *)new wxLocale(arg1,arg2);
|
||||
result = (wxLocale *)new_wxLocale(arg1,arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
|
||||
+91
-224
File diff suppressed because it is too large
Load Diff
@@ -798,7 +798,7 @@ public:
|
||||
int GetNumberJoysticks() { return -1; }
|
||||
int GetManufacturerId() { return -1; }
|
||||
int GetProductId() { return -1; }
|
||||
wxString GetProductName() { return ""; }
|
||||
wxString GetProductName() { return wxEmptyString; }
|
||||
int GetXMin() { return -1; }
|
||||
int GetYMin() { return -1; }
|
||||
int GetZMin() { return -1; }
|
||||
|
||||
+136
-320
File diff suppressed because it is too large
Load Diff
@@ -190,44 +190,6 @@ class CalendarCtrl(_core.Control):
|
||||
As the attributes are specified for each day, they may change when the
|
||||
month is changed, so you will often want to update them in an
|
||||
EVT_CALENDAR_MONTH event handler.
|
||||
|
||||
Window Styles
|
||||
-------------
|
||||
============================== ============================
|
||||
CAL_SUNDAY_FIRST Show Sunday as the first day
|
||||
in the week
|
||||
CAL_MONDAY_FIRST Show Monday as the first day
|
||||
in the week
|
||||
CAL_SHOW_HOLIDAYS Highlight holidays in the
|
||||
calendar
|
||||
CAL_NO_YEAR_CHANGE Disable the year changing
|
||||
CAL_NO_MONTH_CHANGE Disable the month (and,
|
||||
implicitly, the year) changing
|
||||
CAL_SHOW_SURROUNDING_WEEKS Show the neighbouring weeks in
|
||||
the previous and next months
|
||||
CAL_SEQUENTIAL_MONTH_SELECTION Use alternative, more compact,
|
||||
style for the month and year
|
||||
selection controls.
|
||||
|
||||
The default calendar style is CAL_SHOW_HOLIDAYS.
|
||||
|
||||
Events
|
||||
-------
|
||||
=========================== ==============================
|
||||
EVT_CALENDAR A day was double clicked in the
|
||||
calendar.
|
||||
EVT_CALENDAR_SEL_CHANGED The selected date changed.
|
||||
EVT_CALENDAR_DAY The selected day changed.
|
||||
EVT_CALENDAR_MONTH The selected month changed.
|
||||
EVT_CALENDAR_YEAR The selected year changed.
|
||||
EVT_CALENDAR_WEEKDAY_CLICKED User clicked on the week day
|
||||
header
|
||||
|
||||
Note that changing the selected date will result in one of
|
||||
EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED
|
||||
event.
|
||||
|
||||
|
||||
"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -462,15 +424,7 @@ class CalendarCtrl(_core.Control):
|
||||
|
||||
Returns 3-tuple with information about the given position on the
|
||||
calendar control. The first value of the tuple is a result code and
|
||||
determines the validity of the remaining two values. The result codes
|
||||
are:
|
||||
|
||||
=================== ============================================
|
||||
CAL_HITTEST_NOWHERE hit outside of anything
|
||||
CAL_HITTEST_HEADER hit on the header, weekday is valid
|
||||
CAL_HITTEST_DAY hit on a day in the calendar, date is set.
|
||||
=================== ============================================
|
||||
|
||||
determines the validity of the remaining two values.
|
||||
"""
|
||||
return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
|
||||
|
||||
@@ -494,15 +448,15 @@ class CalendarCtrl(_core.Control):
|
||||
"""
|
||||
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _calendar.CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
@@ -531,15 +485,15 @@ def CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs):
|
||||
"""
|
||||
CalendarCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _calendar.CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
|
||||
+21
-20
@@ -1186,13 +1186,14 @@ class GridCellCoords(object):
|
||||
"""__ne__(self, GridCellCoords other) -> bool"""
|
||||
return _grid.GridCellCoords___ne__(*args, **kwargs)
|
||||
|
||||
def asTuple(*args, **kwargs):
|
||||
"""asTuple(self) -> PyObject"""
|
||||
return _grid.GridCellCoords_asTuple(*args, **kwargs)
|
||||
def Get(*args, **kwargs):
|
||||
"""Get(self) -> PyObject"""
|
||||
return _grid.GridCellCoords_Get(*args, **kwargs)
|
||||
|
||||
def __str__(self): return str(self.asTuple())
|
||||
def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple())
|
||||
def __len__(self): return len(self.asTuple())
|
||||
asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")
|
||||
def __str__(self): return str(self.Get())
|
||||
def __repr__(self): return 'wxGridCellCoords'+str(self.Get())
|
||||
def __len__(self): return len(self.Get())
|
||||
def __getitem__(self, index): return self.asTuple()[index]
|
||||
def __setitem__(self, index, val):
|
||||
if index == 0: self.SetRow(val)
|
||||
@@ -1987,15 +1988,15 @@ class Grid(_windows.ScrolledWindow):
|
||||
"""
|
||||
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
@@ -2012,15 +2013,15 @@ def Grid_GetClassDefaultAttributes(*args, **kwargs):
|
||||
"""
|
||||
Grid_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
|
||||
@@ -1409,7 +1409,7 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)
|
||||
return list;
|
||||
}
|
||||
|
||||
PyObject *wxGridCellCoords_asTuple(wxGridCellCoords *self){
|
||||
PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
|
||||
PyObject* tup = PyTuple_New(2);
|
||||
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
|
||||
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
|
||||
@@ -7981,7 +7981,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO
|
||||
}
|
||||
|
||||
|
||||
static PyObject *_wrap_GridCellCoords_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
static PyObject *_wrap_GridCellCoords_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
|
||||
PyObject *result;
|
||||
@@ -7990,12 +7990,12 @@ static PyObject *_wrap_GridCellCoords_asTuple(PyObject *self, PyObject *args, Py
|
||||
(char *) "self", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellCoords_asTuple",kwnames,&obj0)) goto fail;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellCoords_Get",kwnames,&obj0)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellCoords,
|
||||
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (PyObject *)wxGridCellCoords_asTuple(arg1);
|
||||
result = (PyObject *)wxGridCellCoords_Get(arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
@@ -15697,7 +15697,7 @@ static PyMethodDef SwigMethods[] = {
|
||||
{ (char *)"GridCellCoords_Set", (PyCFunction) _wrap_GridCellCoords_Set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"GridCellCoords___eq__", (PyCFunction) _wrap_GridCellCoords___eq__, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"GridCellCoords___ne__", (PyCFunction) _wrap_GridCellCoords___ne__, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"GridCellCoords_asTuple", (PyCFunction) _wrap_GridCellCoords_asTuple, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"GridCellCoords_Get", (PyCFunction) _wrap_GridCellCoords_Get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"GridCellCoords_swigregister", GridCellCoords_swigregister, METH_VARARGS },
|
||||
{ (char *)"new_Grid", (PyCFunction) _wrap_new_Grid, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Grid_CreateGrid", (PyCFunction) _wrap_Grid_CreateGrid, METH_VARARGS | METH_KEYWORDS },
|
||||
|
||||
+14
-14
@@ -1093,15 +1093,15 @@ class HtmlWindow(_windows.ScrolledWindow):
|
||||
"""
|
||||
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
@@ -1128,15 +1128,15 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
|
||||
"""
|
||||
HtmlWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
|
||||
|
||||
Get the default attributes for this class. This is useful if
|
||||
you want to use the same font or colour in your own control as
|
||||
in a standard control -- which is a much better idea than hard
|
||||
coding specific colours or fonts which might look completely out
|
||||
of place on the users system, especially if it uses themes.
|
||||
Get the default attributes for this class. This is useful if you want
|
||||
to use the same font or colour in your own control as in a standard
|
||||
control -- which is a much better idea than hard coding specific
|
||||
colours or fonts which might look completely out of place on the users
|
||||
system, especially if it uses themes.
|
||||
|
||||
The variant parameter is only relevant under Mac currently and is
|
||||
ignore under other platforms. Under Mac, it will change the size of the
|
||||
returned font. See SetWindowVariant for more about this.
|
||||
ignore under other platforms. Under Mac, it will change the size of
|
||||
the returned font. See SetWindowVariant for more about this.
|
||||
"""
|
||||
return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user