mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-22 06:05:36 +08:00
reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -422,10 +422,6 @@
|
||||
%rename(IMAGE_LIST_SMALL) wxIMAGE_LIST_SMALL;
|
||||
%rename(IMAGE_LIST_STATE) wxIMAGE_LIST_STATE;
|
||||
%rename(ImageList) wxImageList;
|
||||
%rename(PenList) wxPenList;
|
||||
%rename(BrushList) wxBrushList;
|
||||
%rename(ColourDatabase) wxColourDatabase;
|
||||
%rename(FontList) wxFontList;
|
||||
%rename(NORMAL_FONT) wxNORMAL_FONT;
|
||||
%rename(SMALL_FONT) wxSMALL_FONT;
|
||||
%rename(ITALIC_FONT) wxITALIC_FONT;
|
||||
@@ -468,6 +464,10 @@
|
||||
%rename(NullPalette) wxNullPalette;
|
||||
%rename(NullFont) wxNullFont;
|
||||
%rename(NullColour) wxNullColour;
|
||||
%rename(PenList) wxPenList;
|
||||
%rename(BrushList) wxBrushList;
|
||||
%rename(ColourDatabase) wxColourDatabase;
|
||||
%rename(FontList) wxFontList;
|
||||
%rename(TheFontList) wxTheFontList;
|
||||
%rename(ThePenList) wxThePenList;
|
||||
%rename(TheBrushList) wxTheBrushList;
|
||||
|
||||
+201
-235
File diff suppressed because it is too large
Load Diff
@@ -921,6 +921,12 @@ class TextAttr(object):
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
def __del__(self, destroy=_controls.delete_TextAttr):
|
||||
"""__del__()"""
|
||||
try:
|
||||
if self.thisown: destroy(self)
|
||||
except: pass
|
||||
|
||||
def Init(*args, **kwargs):
|
||||
"""Init()"""
|
||||
return _controls.TextAttr_Init(*args, **kwargs)
|
||||
@@ -1574,12 +1580,13 @@ class RadioBox(core.Control):
|
||||
return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(Window parent, int id, String label, Point point=DefaultPosition,
|
||||
__init__(Window parent, int id, String label, Point pos=DefaultPosition,
|
||||
Size size=DefaultSize, int choices=0,
|
||||
String choices_array=None, int majorDimension=0,
|
||||
long style=RA_HORIZONTAL, Validator validator=DefaultValidator,
|
||||
String name=RadioBoxNameStr) -> RadioBox
|
||||
"""
|
||||
if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']
|
||||
newobj = _controls.new_RadioBox(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
@@ -1588,7 +1595,7 @@ class RadioBox(core.Control):
|
||||
|
||||
def Create(*args, **kwargs):
|
||||
"""
|
||||
Create(Window parent, int id, String label, Point point=DefaultPosition,
|
||||
Create(Window parent, int id, String label, Point pos=DefaultPosition,
|
||||
Size size=DefaultSize, int choices=0,
|
||||
String choices_array=None, int majorDimension=0,
|
||||
long style=RA_HORIZONTAL, Validator validator=DefaultValidator,
|
||||
@@ -1721,10 +1728,11 @@ class Slider(core.Control):
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(Window parent, int id, int value, int minValue, int maxValue,
|
||||
Point point=DefaultPosition, Size size=DefaultSize,
|
||||
Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
long style=SL_HORIZONTAL, Validator validator=DefaultValidator,
|
||||
String name=SliderNameStr) -> Slider
|
||||
"""
|
||||
if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']
|
||||
newobj = _controls.new_Slider(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
@@ -1734,7 +1742,7 @@ class Slider(core.Control):
|
||||
def Create(*args, **kwargs):
|
||||
"""
|
||||
Create(Window parent, int id, int value, int minValue, int maxValue,
|
||||
Point point=DefaultPosition, Size size=DefaultSize,
|
||||
Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
long style=SL_HORIZONTAL, Validator validator=DefaultValidator,
|
||||
String name=SliderNameStr) -> bool
|
||||
"""
|
||||
@@ -1793,7 +1801,7 @@ class Slider(core.Control):
|
||||
return _controls.Slider_GetThumbLength(*args, **kwargs)
|
||||
|
||||
def SetTickFreq(*args, **kwargs):
|
||||
"""SetTickFreq(int n, int pos)"""
|
||||
"""SetTickFreq(int n, int pos=1)"""
|
||||
return _controls.Slider_SetTickFreq(*args, **kwargs)
|
||||
|
||||
def GetTickFreq(*args, **kwargs):
|
||||
|
||||
+3295
-1036
File diff suppressed because it is too large
Load Diff
+4073
-1764
File diff suppressed because it is too large
Load Diff
+48
-43
@@ -126,6 +126,10 @@ def ColourRGB(*args, **kwargs):
|
||||
val.thisown = 1
|
||||
return val
|
||||
|
||||
Color = Colour
|
||||
NamedColor = NamedColour
|
||||
ColorRGB = ColourRGB
|
||||
|
||||
class Palette(GDIObject):
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
@@ -3406,6 +3410,49 @@ class PenListPtr(PenList):
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = PenList
|
||||
_gdi.PenList_swigregister(PenListPtr)
|
||||
cvar = _gdi.cvar
|
||||
NORMAL_FONT = cvar.NORMAL_FONT
|
||||
SMALL_FONT = cvar.SMALL_FONT
|
||||
ITALIC_FONT = cvar.ITALIC_FONT
|
||||
SWISS_FONT = cvar.SWISS_FONT
|
||||
RED_PEN = cvar.RED_PEN
|
||||
CYAN_PEN = cvar.CYAN_PEN
|
||||
GREEN_PEN = cvar.GREEN_PEN
|
||||
BLACK_PEN = cvar.BLACK_PEN
|
||||
WHITE_PEN = cvar.WHITE_PEN
|
||||
TRANSPARENT_PEN = cvar.TRANSPARENT_PEN
|
||||
BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN
|
||||
GREY_PEN = cvar.GREY_PEN
|
||||
MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN
|
||||
LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN
|
||||
BLUE_BRUSH = cvar.BLUE_BRUSH
|
||||
GREEN_BRUSH = cvar.GREEN_BRUSH
|
||||
WHITE_BRUSH = cvar.WHITE_BRUSH
|
||||
BLACK_BRUSH = cvar.BLACK_BRUSH
|
||||
TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH
|
||||
CYAN_BRUSH = cvar.CYAN_BRUSH
|
||||
RED_BRUSH = cvar.RED_BRUSH
|
||||
GREY_BRUSH = cvar.GREY_BRUSH
|
||||
MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH
|
||||
LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH
|
||||
BLACK = cvar.BLACK
|
||||
WHITE = cvar.WHITE
|
||||
RED = cvar.RED
|
||||
BLUE = cvar.BLUE
|
||||
GREEN = cvar.GREEN
|
||||
CYAN = cvar.CYAN
|
||||
LIGHT_GREY = cvar.LIGHT_GREY
|
||||
STANDARD_CURSOR = cvar.STANDARD_CURSOR
|
||||
HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR
|
||||
CROSS_CURSOR = cvar.CROSS_CURSOR
|
||||
NullBitmap = cvar.NullBitmap
|
||||
NullIcon = cvar.NullIcon
|
||||
NullCursor = cvar.NullCursor
|
||||
NullPen = cvar.NullPen
|
||||
NullBrush = cvar.NullBrush
|
||||
NullPalette = cvar.NullPalette
|
||||
NullFont = cvar.NullFont
|
||||
NullColour = cvar.NullColour
|
||||
|
||||
class BrushList(core.Object):
|
||||
def __init__(self): raise RuntimeError, "No constructor defined"
|
||||
@@ -3509,6 +3556,7 @@ _gdi.FontList_swigregister(FontListPtr)
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
NullColor = NullColour
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
class Effects(core.Object):
|
||||
@@ -3582,49 +3630,6 @@ class EffectsPtr(Effects):
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = Effects
|
||||
_gdi.Effects_swigregister(EffectsPtr)
|
||||
cvar = _gdi.cvar
|
||||
NORMAL_FONT = cvar.NORMAL_FONT
|
||||
SMALL_FONT = cvar.SMALL_FONT
|
||||
ITALIC_FONT = cvar.ITALIC_FONT
|
||||
SWISS_FONT = cvar.SWISS_FONT
|
||||
RED_PEN = cvar.RED_PEN
|
||||
CYAN_PEN = cvar.CYAN_PEN
|
||||
GREEN_PEN = cvar.GREEN_PEN
|
||||
BLACK_PEN = cvar.BLACK_PEN
|
||||
WHITE_PEN = cvar.WHITE_PEN
|
||||
TRANSPARENT_PEN = cvar.TRANSPARENT_PEN
|
||||
BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN
|
||||
GREY_PEN = cvar.GREY_PEN
|
||||
MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN
|
||||
LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN
|
||||
BLUE_BRUSH = cvar.BLUE_BRUSH
|
||||
GREEN_BRUSH = cvar.GREEN_BRUSH
|
||||
WHITE_BRUSH = cvar.WHITE_BRUSH
|
||||
BLACK_BRUSH = cvar.BLACK_BRUSH
|
||||
TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH
|
||||
CYAN_BRUSH = cvar.CYAN_BRUSH
|
||||
RED_BRUSH = cvar.RED_BRUSH
|
||||
GREY_BRUSH = cvar.GREY_BRUSH
|
||||
MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH
|
||||
LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH
|
||||
BLACK = cvar.BLACK
|
||||
WHITE = cvar.WHITE
|
||||
RED = cvar.RED
|
||||
BLUE = cvar.BLUE
|
||||
GREEN = cvar.GREEN
|
||||
CYAN = cvar.CYAN
|
||||
LIGHT_GREY = cvar.LIGHT_GREY
|
||||
STANDARD_CURSOR = cvar.STANDARD_CURSOR
|
||||
HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR
|
||||
CROSS_CURSOR = cvar.CROSS_CURSOR
|
||||
NullBitmap = cvar.NullBitmap
|
||||
NullIcon = cvar.NullIcon
|
||||
NullCursor = cvar.NullCursor
|
||||
NullPen = cvar.NullPen
|
||||
NullBrush = cvar.NullBrush
|
||||
NullPalette = cvar.NullPalette
|
||||
NullFont = cvar.NullFont
|
||||
NullColour = cvar.NullColour
|
||||
TheFontList = cvar.TheFontList
|
||||
ThePenList = cvar.ThePenList
|
||||
TheBrushList = cvar.TheBrushList
|
||||
|
||||
+2812
-1509
File diff suppressed because it is too large
Load Diff
+1921
-600
File diff suppressed because it is too large
Load Diff
+753
-373
File diff suppressed because it is too large
Load Diff
+2502
-1047
File diff suppressed because it is too large
Load Diff
@@ -650,9 +650,10 @@ class SplitterWindow(core.Window):
|
||||
return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(Window parent, int id, Point point=DefaultPosition,
|
||||
Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
|
||||
__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
|
||||
"""
|
||||
if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']
|
||||
newobj = _windows.new_SplitterWindow(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
@@ -661,8 +662,8 @@ class SplitterWindow(core.Window):
|
||||
|
||||
def Create(*args, **kwargs):
|
||||
"""
|
||||
Create(Window parent, int id, Point point=DefaultPosition,
|
||||
Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool
|
||||
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
|
||||
long style=SP_3D, String name=SplitterNameStr) -> bool
|
||||
"""
|
||||
return _windows.SplitterWindow_Create(*args, **kwargs)
|
||||
|
||||
|
||||
+2143
-744
File diff suppressed because it is too large
Load Diff
+237
-214
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user