AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More docstrings and rearrainged a couple things.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-11-26 06:09:56 +00:00
parent 8feaa81f86
commit 1e0c87227c
24 changed files with 958 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/setup.py
View File

@ -644,7 +644,8 @@ depends = [ #'include/wx/wxPython/wxPython.h',
msg('Preparing CORE...')
swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_app.i',
[ 'src/_accel.i',
'src/_app.i',
'src/_app_ex.py',
'src/_constraints.i',
'src/_core_api.i',
@ -745,7 +746,6 @@ swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_windows_rename.i', 'src/_windows_reverse.txt',
'src/_panel.i',
'src/_accel.i',
'src/_toplvl.i', 'src/_statusbar.i',
'src/_splitter.i', 'src/_sashwin.i',
'src/_popupwin.i', 'src/_tipwin.i',

5
wxPython/src/_accel.i
View File

@ -49,7 +49,10 @@ public:
class wxAcceleratorTable : public wxObject {
public:
// Can also accept a list of 3-tuples
DocAStr(wxAcceleratorTable,
"__init__(entries) -> AcceleratorTable",
"Construct an AcceleratorTable from a list of AcceleratorEntry items or\n"
"3-tuples (flags, keyCode, cmdID)");
wxAcceleratorTable(int n, const wxAcceleratorEntry* entries);
~wxAcceleratorTable();

3
wxPython/src/_app_ex.py
View File

@ -118,17 +118,20 @@ your Mac."""
def SetTopWindow(self, frame):
"""Set the \"main\" top level window"""
if self.stdioWin:
self.stdioWin.SetParent(frame)
wx.PyApp.SetTopWindow(self, frame)
def MainLoop(self):
"""Execute the main GUI event loop"""
wx.PyApp.MainLoop(self)
self.RestoreStdio()
def RedirectStdio(self, filename):
"""Redirect sys.stdout and sys.stderr to a file or a popup window."""
if filename:
_sys.stdout = _sys.stderr = open(filename, 'a')
else:

21
wxPython/src/_artprov.i
View File

@ -108,32 +108,35 @@ public:
%addtofunc wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
wxPyArtProvider();
// ~wxPyArtProvider();
void _setCallbackInfo(PyObject* self, PyObject* _class);
// Add new provider to the top of providers stack.
DocStr(PushProvider, "Add new provider to the top of providers stack.");
static void PushProvider(wxPyArtProvider *provider);
// Remove latest added provider and delete it.
DocStr(PopProvider, "Remove latest added provider and delete it.");
static bool PopProvider();
// Remove provider. The provider must have been added previously!
// The provider is _not_ deleted.
DocStr(RemoveProvider,
"Remove provider. The provider must have been added previously!\n"
"The provider is _not_ deleted.");
static bool RemoveProvider(wxPyArtProvider *provider);
// Query the providers for bitmap with given ID and return it. Return
// wxNullBitmap if no provider provides it.
DocStr(GetBitmap,
"Query the providers for bitmap with given ID and return it. Return\n"
"wx.NullBitmap if no provider provides it.");
static wxBitmap GetBitmap(const wxString& id,
const wxString& client = wxPyART_OTHER,
const wxSize& size = wxDefaultSize);
// Query the providers for icon with given ID and return it. Return
// wxNullIcon if no provider provides it.
DocStr(GetIcon,
"Query the providers for icon with given ID and return it. Return\n"
"wx.NullIcon if no provider provides it.");
static wxIcon GetIcon(const wxString& id,
const wxString& client = wxPyART_OTHER,
const wxSize& size = wxDefaultSize);
%extend { void Destroy() { delete self; }}
};

95
wxPython/src/_bitmap.i
View File

@ -47,14 +47,36 @@
class wxBitmap : public wxGDIObject
{
public:
wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY);
DocCtorStr(
wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY),
"Loads a bitmap from a file.");
~wxBitmap();
// alternate constructors
%name(EmptyBitmap) wxBitmap(int width, int height, int depth=-1);
%name(BitmapFromIcon) wxBitmap(const wxIcon& icon);
%name(BitmapFromImage) wxBitmap(const wxImage& image, int depth=-1);
DocCtorStrName(
wxBitmap(int width, int height, int depth=-1),
"Creates a new bitmap of the given size. A depth of -1 indicates the depth of\n"
"the current screen or visual. Some platforms only support 1 for monochrome and\n"
"-1 for the current colour setting.",
EmptyBitmap);
DocCtorStrName(
wxBitmap(const wxIcon& icon),
"Create a new bitmap from an Icon object.",
BitmapFromIcon);
DocCtorStrName(
wxBitmap(const wxImage& image, int depth=-1),
"Creates bitmap object from the image. This has to be done to actually display\n"
"an image as you cannot draw an image directly on a window. The resulting\n"
"bitmap will use the provided colour depth (or that of the current system if\n"
"depth is -1) which entails that a colour reduction has to take place.",
BitmapFromImage);
%extend {
DocStr(wxBitmap(PyObject* listOfStrings),
"Construct a Bitmap from a list of strings formatted as XPM data.");
%name(BitmapFromXPMData) wxBitmap(PyObject* listOfStrings) {
char** cArray = NULL;
wxBitmap* bmp;
@ -67,7 +89,12 @@ public:
return bmp;
}
%name(BitmapFromBits) wxBitmap(PyObject* bits, int width, int height, int depth = 1 ) {
DocStr(wxBitmap(PyObject* bits, int width, int height, int depth=1 ),
"Creates a bitmap from an array of bits. You should only use this function for\n"
"monochrome bitmaps (depth 1) in portable programs: in this case the bits\n"
"parameter should contain an XBM image. For other bit depths, the behaviour is\n"
"platform dependent.");
%name(BitmapFromBits) wxBitmap(PyObject* bits, int width, int height, int depth=1 ) {
char* buf;
int length;
PyString_AsStringAndSize(bits, &buf, &length);
@ -88,28 +115,51 @@ public:
bool Ok();
DocStr(GetWidth, "Gets the width of the bitmap in pixels.");
int GetWidth();
DocStr(GetHeight, "Gets the height of the bitmap in pixels.");
int GetHeight();
DocStr(GetDepth,
"Gets the colour depth of the bitmap. A value of 1 indicates a\n"
"monochrome bitmap.");
int GetDepth();
DocStr(ConvertToImage,
"Creates a platform-independent image from a platform-dependent bitmap. This\n"
"preserves mask information so that bitmaps and images can be converted back\n"
"and forth without loss in that respect.");
virtual wxImage ConvertToImage() const;
DocStr(GetMask,
"Gets the associated mask (if any) which may have been loaded from a file\n"
"or explpicitly set for the bitmap.");
virtual wxMask* GetMask() const;
DocStr(SetMask,
"Sets the mask for this bitmap.");
virtual void SetMask(wxMask* mask);
%extend {
DocStr(SetMaskColour,
"Create a Mask based on a specified colour in the Bitmap.");
void SetMaskColour(const wxColour& colour) {
wxMask *mask = new wxMask(*self, colour);
self->SetMask(mask);
}
}
// def SetMaskColour(self, colour):
// mask = wxMaskColour(self, colour)
// self.SetMask(mask)
DocStr(GetSubBitmap,
"Returns a sub bitmap of the current one as long as the rect belongs entirely\n"
"to the bitmap. This function preserves bit depth and mask information.");
virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
DocStr(SaveFile, "Saves a bitmap in the named file.");
virtual bool SaveFile(const wxString &name, wxBitmapType type,
wxPalette *palette = (wxPalette *)NULL);
DocStr(LoadFile, "Loads a bitmap from a file");
virtual bool LoadFile(const wxString &name, wxBitmapType type);
@ -118,13 +168,19 @@ public:
virtual void SetPalette(const wxPalette& palette);
#endif
// copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon);
virtual bool CopyFromIcon(const wxIcon& icon);
DocStr(SetHeight, "Set the height property (does not affect the bitmap data).")
virtual void SetHeight(int height);
DocStr(SetWidth, "Set the width property (does not affect the bitmap data).")
virtual void SetWidth(int width);
DocStr(SetDepth, "Set the depth property (does not affect the bitmap data).")
virtual void SetDepth(int depth);
#ifdef __WXMSW__
bool CopyFromCursor(const wxCursor& cursor);
int GetQuality();
@ -137,10 +193,23 @@ public:
//---------------------------------------------------------------------------
DocStr(wxMask,
"This class encapsulates a monochrome mask bitmap, where the masked area is\n"
"black and the unmasked area is white. When associated with a bitmap and drawn\n"
"in a device context, the unmasked area of the bitmap will be drawn, and the\n"
"masked area will not be drawn.");
class wxMask : public wxObject {
public:
wxMask(const wxBitmap& bitmap);
%name(MaskColour) wxMask(const wxBitmap& bitmap, const wxColour& colour);
DocCtorStr(
wxMask(const wxBitmap& bitmap),
"Constructs a mask from a monochrome bitmap.");
DocCtorStrName(
wxMask(const wxBitmap& bitmap, const wxColour& colour),
"Constructs a mask from a bitmap and a colour in that bitmap that indicates the\n"
"background.",
MaskColour);
//~wxMask();

8
wxPython/src/_brush.i
View File

@ -16,11 +16,17 @@
//---------------------------------------------------------------------------
%newgroup
DocStr(wxBrush,
"A brush is a drawing tool for filling in areas. It is used for painting the\n"
"background of rectangles, ellipses, etc. It has a colour and a style.");
class wxBrush : public wxGDIObject {
public:
DocStr(wxBrush, "Constructs a brush from a colour object and style.");
wxBrush(const wxColour& colour, int style=wxSOLID);
~wxBrush();
virtual void SetColour(const wxColour& col);
virtual void SetStyle(int style);
virtual void SetStipple(const wxBitmap& stipple);

93
wxPython/src/_button.i
View File

@ -33,22 +33,25 @@ enum {
//---------------------------------------------------------------------------
// A button is a control that contains a text string, and is one of the most
// common elements of a GUI. It may be placed on a dialog box or panel, or
// indeed almost any other window.
//
// Styles
// wxBU_LEFT: Left-justifies the label. WIN32 only.
// wxBU_TOP: Aligns the label to the top of the button. WIN32 only.
// wxBU_RIGHT: Right-justifies the bitmap label. WIN32 only.
// wxBU_BOTTOM: Aligns the label to the bottom of the button. WIN32 only.
// wxBU_EXACTFIT: Creates the button as small as possible instead of making
// it of the standard size (which is the default behaviour.)
//
// Events
// EVT_BUTTON(win,id,func):
// Sent when the button is clicked.
//
DocStr(wxButton,
"A button is a control that contains a text string, and is one of the most\n"
"common elements of a GUI. It may be placed on a dialog box or panel, or\n"
"indeed almost any other window.");
RefDoc(wxButton, "
Styles
wxBU_LEFT: Left-justifies the label. WIN32 only.
wxBU_TOP: Aligns the label to the top of the button. WIN32 only.
wxBU_RIGHT: Right-justifies the bitmap label. WIN32 only.
wxBU_BOTTOM: Aligns the label to the bottom of the button. WIN32 only.
wxBU_EXACTFIT: Creates the button as small as possible instead of making
it of the standard size (which is the default behaviour.)
Events
EVT_BUTTON(win,id,func):
Sent when the button is clicked.
");
class wxButton : public wxControl
{
public:
@ -56,17 +59,7 @@ public:
%addtofunc wxButton() ""
// Constructor, creating and showing a button.
//
// parent: Parent window. Must not be None.
// id: Button identifier. A value of -1 indicates a default value.
// label: The text to be displayed on the button.
// pos: The button position on it's parent.
// size: Button size. If the default size (-1, -1) is specified then the
// button is sized appropriately for the text.
// style: Window style. See wxButton.
// validator: Window validator.
// name: Window name.
DocStr(wxButton, "Create and show a button.")
wxButton(wxWindow* parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@ -74,10 +67,10 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyButtonNameStr);
// Default constructor
DocStr(wxButton(), "Precreate a Button for 2-phase creation.");
%name(PreButton)wxButton();
// Button creation function for two-step creation.
DocStr(Create, "Acutally create the GUI Button for 2-phase creation.");
bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@ -86,13 +79,7 @@ public:
const wxString& name = wxPyButtonNameStr);
// This sets the button to be the default item for the panel or dialog box.
//
// Under Windows, only dialog box buttons respond to this function. As
// normal under Windows and Motif, pressing return causes the default
// button to be depressed when the return key is pressed. See also
// wxWindow.SetFocus which sets the keyboard focus for windows and text
// panel items, and wxPanel.SetDefaultItem.
DocStr(SetDefault, "This sets the button to be the default item for the panel or dialog box.");
void SetDefault();
@ -104,7 +91,7 @@ public:
void SetImageMargins(wxCoord x, wxCoord y);
#endif
// returns the default button size for this platform
DocStr(GetDefaultButtonSize, "Returns the default button size for this platform.");
static wxSize GetDefaultSize();
};
@ -112,34 +99,58 @@ public:
//---------------------------------------------------------------------------
DocStr(wxBitmapButton, "A Buttont that contains a bitmap.");
class wxBitmapButton : public wxButton
{
public:
%addtofunc wxBitmapButton "self._setOORInfo(self)"
%addtofunc wxBitmapButton() ""
DocStr(wxBitmapButton, "Create and show a button.")
wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyButtonNameStr);
DocStr(wxBitmapButton(), "Precreate a BitmapButton for 2-phase creation.");
%name(PreBitmapButton)wxBitmapButton();
DocStr(Create, "Acutally create the GUI BitmapButton for 2-phase creation.");
bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxBU_AUTODRAW,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyButtonNameStr);
DocStr(GetBitmapLabel, "Returns the label bitmap (the one passed to the constructor).");
wxBitmap GetBitmapLabel();
DocStr(GetBitmapDisabled, "Returns the bitmap for the disabled state.");
wxBitmap GetBitmapDisabled();
DocStr(GetBitmapFocus, "Returns the bitmap for the focused state.");
wxBitmap GetBitmapFocus();
DocStr(GetBitmapSelected, "Returns the bitmap for the selected state.");
wxBitmap GetBitmapSelected();
DocStr(SetBitmapDisabled, "Sets the bitmap for the disabled button appearance.");
void SetBitmapDisabled(const wxBitmap& bitmap);
DocStr(SetBitmapFocus, "Sets the bitmap for the button appearance when it has the keyboard focus.");
void SetBitmapFocus(const wxBitmap& bitmap);
DocStr(SetBitmapSelected, "Sets the bitmap for the selected (depressed) button appearance.");
void SetBitmapSelected(const wxBitmap& bitmap);
DocStr(SetBitmapLabel,
"Sets the bitmap label for the button. This is the bitmap used for the\n"
"unselected state, and for all other states if no other bitmaps are provided.");
void SetBitmapLabel(const wxBitmap& bitmap);
void SetMargins(int x, int y);

4
wxPython/src/_core_rename.i
View File

@ -610,6 +610,10 @@
%rename(PostEvent) wxPostEvent;
%rename(App_CleanUp) wxApp_CleanUp;
%rename(GetApp) wxGetApp;
%rename(AcceleratorEntry) wxAcceleratorEntry;
%rename(AcceleratorTable) wxAcceleratorTable;
%rename(NullAcceleratorTable) wxNullAcceleratorTable;
%rename(GetAccelFromString) wxGetAccelFromString;
%rename(Window) wxWindow;
%rename(FindWindowById) wxFindWindowById;
%rename(FindWindowByName) wxFindWindowByName;

4
wxPython/src/_defs.i
View File

@ -183,6 +183,10 @@ typedef unsigned char byte;
%name(newname) decl
%enddef
// A placeholder for the detailed reference docs.
%define RefDoc(decl, docstr)
%enddef
%define %newgroup

4
wxPython/src/_windows_rename.i
View File

@ -5,10 +5,6 @@
%rename(Panel) wxPanel;
%rename(ScrolledWindow) wxScrolledWindow;
%rename(AcceleratorEntry) wxAcceleratorEntry;
%rename(AcceleratorTable) wxAcceleratorTable;
%rename(NullAcceleratorTable) wxNullAcceleratorTable;
%rename(GetAccelFromString) wxGetAccelFromString;
%rename(FULLSCREEN_NOMENUBAR) wxFULLSCREEN_NOMENUBAR;
%rename(FULLSCREEN_NOTOOLBAR) wxFULLSCREEN_NOTOOLBAR;
%rename(FULLSCREEN_NOSTATUSBAR) wxFULLSCREEN_NOSTATUSBAR;

1
wxPython/src/core.i
View File

@ -68,6 +68,7 @@ wx = _sys.modules[__name__]
%include _evthandler.i
%include _event.i
%include _app.i
%include _accel.i
%include _window.i
%include _validator.i
%include _menu.i

67
wxPython/src/gtk/controls.py
View File

@ -14,14 +14,18 @@ BU_BOTTOM = _controls.BU_BOTTOM
BU_EXACTFIT = _controls.BU_EXACTFIT
BU_AUTODRAW = _controls.BU_AUTODRAW
class Button(core.Control):
""""""
"""A button is a control that contains a text string, and is one of the most
common elements of a GUI. It may be placed on a dialog box or panel, or
indeed almost any other window."""
def __repr__(self):
return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Window parent, int id, wxString label, Point pos=DefaultPosition,
Size size=DefaultSize, long style=0,
Validator validator=DefaultValidator,
wxString name=wxPyButtonNameStr) -> Button"""
wxString name=wxPyButtonNameStr) -> Button
Create and show a button."""
newobj = _controls.new_Button(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -32,11 +36,15 @@ class Button(core.Control):
"""Create(Window parent, int id, wxString label, Point pos=DefaultPosition,
Size size=DefaultSize, long style=0,
Validator validator=DefaultValidator,
wxString name=wxPyButtonNameStr) -> bool"""
wxString name=wxPyButtonNameStr) -> bool
Acutally create the GUI Button for 2-phase creation."""
return _controls.Button_Create(*args, **kwargs)
def SetDefault(*args, **kwargs):
"""SetDefault()"""
"""SetDefault()
This sets the button to be the default item for the panel or dialog box."""
return _controls.Button_SetDefault(*args, **kwargs)
def GetDefaultSize(*args, **kwargs):
@ -53,7 +61,9 @@ class ButtonPtr(Button):
_controls.Button_swigregister(ButtonPtr)
def PreButton(*args, **kwargs):
"""PreButton() -> Button"""
"""PreButton() -> Button
Precreate a Button for 2-phase creation."""
val = _controls.new_PreButton(*args, **kwargs)
val.thisown = 1
return val
@ -63,14 +73,16 @@ def Button_GetDefaultSize(*args, **kwargs):
return _controls.Button_GetDefaultSize(*args, **kwargs)
class BitmapButton(Button):
""""""
"""A Buttont that contains a bitmap."""
def __repr__(self):
return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition,
Size size=DefaultSize, long style=BU_AUTODRAW,
Validator validator=DefaultValidator,
wxString name=wxPyButtonNameStr) -> BitmapButton"""
wxString name=wxPyButtonNameStr) -> BitmapButton
Create and show a button."""
newobj = _controls.new_BitmapButton(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -81,39 +93,58 @@ class BitmapButton(Button):
"""Create(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition,
Size size=DefaultSize, long style=BU_AUTODRAW,
Validator validator=DefaultValidator,
wxString name=wxPyButtonNameStr) -> bool"""
wxString name=wxPyButtonNameStr) -> bool
Acutally create the GUI BitmapButton for 2-phase creation."""
return _controls.BitmapButton_Create(*args, **kwargs)
def GetBitmapLabel(*args, **kwargs):
"""GetBitmapLabel() -> wxBitmap"""
"""GetBitmapLabel() -> wxBitmap
Returns the label bitmap (the one passed to the constructor)."""
return _controls.BitmapButton_GetBitmapLabel(*args, **kwargs)
def GetBitmapDisabled(*args, **kwargs):
"""GetBitmapDisabled() -> wxBitmap"""
"""GetBitmapDisabled() -> wxBitmap
Returns the bitmap for the disabled state."""
return _controls.BitmapButton_GetBitmapDisabled(*args, **kwargs)
def GetBitmapFocus(*args, **kwargs):
"""GetBitmapFocus() -> wxBitmap"""
"""GetBitmapFocus() -> wxBitmap
Returns the bitmap for the focused state."""
return _controls.BitmapButton_GetBitmapFocus(*args, **kwargs)
def GetBitmapSelected(*args, **kwargs):
"""GetBitmapSelected() -> wxBitmap"""
"""GetBitmapSelected() -> wxBitmap
Returns the bitmap for the selected state."""
return _controls.BitmapButton_GetBitmapSelected(*args, **kwargs)
def SetBitmapDisabled(*args, **kwargs):
"""SetBitmapDisabled(wxBitmap bitmap)"""
"""SetBitmapDisabled(wxBitmap bitmap)
Sets the bitmap for the disabled button appearance."""
return _controls.BitmapButton_SetBitmapDisabled(*args, **kwargs)
def SetBitmapFocus(*args, **kwargs):
"""SetBitmapFocus(wxBitmap bitmap)"""
"""SetBitmapFocus(wxBitmap bitmap)
Sets the bitmap for the button appearance when it has the keyboard focus."""
return _controls.BitmapButton_SetBitmapFocus(*args, **kwargs)
def SetBitmapSelected(*args, **kwargs):
"""SetBitmapSelected(wxBitmap bitmap)"""
"""SetBitmapSelected(wxBitmap bitmap)
Sets the bitmap for the selected (depressed) button appearance."""
return _controls.BitmapButton_SetBitmapSelected(*args, **kwargs)
def SetBitmapLabel(*args, **kwargs):
"""SetBitmapLabel(wxBitmap bitmap)"""
"""SetBitmapLabel(wxBitmap bitmap)
Sets the bitmap label for the button. This is the bitmap used for the
unselected state, and for all other states if no other bitmaps are provided."""
return _controls.BitmapButton_SetBitmapLabel(*args, **kwargs)
def SetMargins(*args, **kwargs):
@ -137,7 +168,9 @@ class BitmapButtonPtr(BitmapButton):
_controls.BitmapButton_swigregister(BitmapButtonPtr)
def PreBitmapButton(*args, **kwargs):
"""PreBitmapButton() -> BitmapButton"""
"""PreBitmapButton() -> BitmapButton
Precreate a BitmapButton for 2-phase creation."""
val = _controls.new_PreBitmapButton(*args, **kwargs)
val.thisown = 1
return val

11
wxPython/src/gtk/controls_wrap.cpp
View File

File diff suppressed because one or more lines are too long

97
wxPython/src/gtk/core.py
View File

@ -4889,17 +4889,20 @@ your Mac."""
def SetTopWindow(self, frame):
"""Set the \"main\" top level window"""
if self.stdioWin:
self.stdioWin.SetParent(frame)
wx.PyApp.SetTopWindow(self, frame)
def MainLoop(self):
"""Execute the main GUI event loop"""
wx.PyApp.MainLoop(self)
self.RestoreStdio()
def RedirectStdio(self, filename):
"""Redirect sys.stdout and sys.stderr to a file or a popup window."""
if filename:
_sys.stdout = _sys.stderr = open(filename, 'a')
else:
@ -4982,6 +4985,91 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
#---------------------------------------------------------------------------
class AcceleratorEntry(object):
""""""
def __repr__(self):
return "<%s.%s; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(int flags=0, int keyCode=0, int cmd=0, MenuItem item=None) -> AcceleratorEntry"""
newobj = _core.new_AcceleratorEntry(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_core.delete_AcceleratorEntry):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Set(*args, **kwargs):
"""Set(int flags, int keyCode, int cmd, MenuItem item=None)"""
return _core.AcceleratorEntry_Set(*args, **kwargs)
def SetMenuItem(*args, **kwargs):
"""SetMenuItem(MenuItem item)"""
return _core.AcceleratorEntry_SetMenuItem(*args, **kwargs)
def GetMenuItem(*args, **kwargs):
"""GetMenuItem() -> MenuItem"""
return _core.AcceleratorEntry_GetMenuItem(*args, **kwargs)
def GetFlags(*args, **kwargs):
"""GetFlags() -> int"""
return _core.AcceleratorEntry_GetFlags(*args, **kwargs)
def GetKeyCode(*args, **kwargs):
"""GetKeyCode() -> int"""
return _core.AcceleratorEntry_GetKeyCode(*args, **kwargs)
def GetCommand(*args, **kwargs):
"""GetCommand() -> int"""
return _core.AcceleratorEntry_GetCommand(*args, **kwargs)
class AcceleratorEntryPtr(AcceleratorEntry):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = AcceleratorEntry
_core.AcceleratorEntry_swigregister(AcceleratorEntryPtr)
class AcceleratorTable(Object):
""""""
def __repr__(self):
return "<%s.%s; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(entries) -> AcceleratorTable
Construct an AcceleratorTable from a list of AcceleratorEntry items or
3-tuples (flags, keyCode, cmdID)"""
newobj = _core.new_AcceleratorTable(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_core.delete_AcceleratorTable):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Ok(*args, **kwargs):
"""Ok() -> bool"""
return _core.AcceleratorTable_Ok(*args, **kwargs)
class AcceleratorTablePtr(AcceleratorTable):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = AcceleratorTable
_core.AcceleratorTable_swigregister(AcceleratorTablePtr)
def GetAccelFromString(*args, **kwargs):
"""GetAccelFromString(wxString label) -> AcceleratorEntry"""
return _core.GetAccelFromString(*args, **kwargs)
#---------------------------------------------------------------------------
class Window(EvtHandler):
""""""
def __repr__(self):
@ -5434,11 +5522,11 @@ more or less independent of the screen window size."""
return _core.Window_GetValidator(*args, **kwargs)
def SetAcceleratorTable(*args, **kwargs):
"""SetAcceleratorTable(wxAcceleratorTable accel)"""
"""SetAcceleratorTable(AcceleratorTable accel)"""
return _core.Window_SetAcceleratorTable(*args, **kwargs)
def GetAcceleratorTable(*args, **kwargs):
"""GetAcceleratorTable() -> wxAcceleratorTable"""
"""GetAcceleratorTable() -> AcceleratorTable"""
return _core.Window_GetAcceleratorTable(*args, **kwargs)
def RegisterHotKey(*args, **kwargs):
@ -5795,6 +5883,7 @@ class WindowPtr(Window):
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Window
_core.Window_swigregister(WindowPtr)
NullAcceleratorTable = cvar.NullAcceleratorTable
PanelNameStr = cvar.PanelNameStr
def PreWindow(*args, **kwargs):
@ -6412,11 +6501,11 @@ class MenuItem(Object):
return _core.MenuItem_GetHelp(*args, **kwargs)
def GetAccel(*args, **kwargs):
"""GetAccel() -> wxAcceleratorEntry"""
"""GetAccel() -> AcceleratorEntry"""
return _core.MenuItem_GetAccel(*args, **kwargs)
def SetAccel(*args, **kwargs):
"""SetAccel(wxAcceleratorEntry accel)"""
"""SetAccel(AcceleratorEntry accel)"""
return _core.MenuItem_SetAccel(*args, **kwargs)
def GetDefaultMarginWidth(*args, **kwargs):

386
wxPython/src/gtk/core_wrap.cpp
View File

@ -18512,6 +18512,372 @@ static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs)
}
static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) 0 ;
int arg2 = (int) 0 ;
int arg3 = (int) 0 ;
wxMenuItem *arg4 = (wxMenuItem *) NULL ;
wxAcceleratorEntry *result;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail;
if (obj3) {
if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int arg2 ;
int arg3 ;
int arg4 ;
wxMenuItem *arg5 = (wxMenuItem *) NULL ;
PyObject * obj0 = 0 ;
PyObject * obj4 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (obj4) {
if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Set(arg2,arg3,arg4,arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
wxMenuItem *arg2 = (wxMenuItem *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetMenuItem(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
wxMenuItem *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetFlags();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetKeyCode();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetCommand();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj);
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
wxAcceleratorTable *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "n", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail;
{
arg2 = wxAcceleratorEntry_LIST_helper(obj0);
if (arg2) arg1 = PyList_Size(obj0);
else arg1 = 0;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorTable *)new wxAcceleratorTable(arg1,(wxAcceleratorEntry const *)arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorTable, 1);
{
delete [] arg2;
}
return resultobj;
fail:
{
delete [] arg2;
}
return NULL;
}
static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxAcceleratorTable const *)arg1)->Ok();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj);
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static int _wrap_NullAcceleratorTable_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only.");
return 1;
}
static PyObject *_wrap_NullAcceleratorTable_get() {
PyObject *pyobj;
pyobj = SWIG_NewPointerObj((void *) &wxNullAcceleratorTable, SWIGTYPE_p_wxAcceleratorTable, 0);
return pyobj;
}
static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString *arg1 = 0 ;
wxAcceleratorEntry *result;
bool temp1 = False ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "label", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = True;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorEntry *)wxGetAccelFromString((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 0);
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
static int _wrap_PanelNameStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only.");
return 1;
@ -35612,6 +35978,20 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS },
{ (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS },
{ (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS },
{ (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS },
@ -36443,6 +36823,9 @@ static void *_p_wxWindowTo_p_wxObject(void *x) {
static void *_p_wxControlTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxControl *) x));
}
static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
return (void *)((wxObject *) ((wxAcceleratorTable *) x));
}
static void *_p_wxGridSizerTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x));
}
@ -36716,7 +37099,7 @@ static swig_type_info _swigt__p_wxImageHistogram[] = {{"_p_wxImageHistogram", 0,
static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}};
static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}};
static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{0}};
static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}};
static swig_type_info _swigt__p_wxPyInputStream[] = {{"_p_wxPyInputStream", 0, "wxPyInputStream *", 0},{"_p_wxPyInputStream"},{0}};
static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}};
static swig_type_info _swigt__p_wxInputStream[] = {{"_p_wxInputStream", 0, "wxInputStream *", 0},{"_p_wxInputStream"},{0}};
@ -37801,6 +38184,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS));
PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS));
PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER));
SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set);

110
wxPython/src/gtk/gdi.py
View File

@ -273,11 +273,14 @@ Pen = PyPen
#---------------------------------------------------------------------------
class Brush(GDIObject):
""""""
"""A brush is a drawing tool for filling in areas. It is used for painting the
background of rectangles, ellipses, etc. It has a colour and a style."""
def __repr__(self):
return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Colour colour, int style=SOLID) -> Brush"""
"""__init__(Colour colour, int style=SOLID) -> Brush
Constructs a brush from a colour object and style."""
newobj = _gdi.new_Brush(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -330,7 +333,9 @@ class Bitmap(GDIObject):
def __repr__(self):
return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap"""
"""__init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap
Loads a bitmap from a file."""
newobj = _gdi.new_Bitmap(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -346,43 +351,68 @@ class Bitmap(GDIObject):
return _gdi.Bitmap_Ok(*args, **kwargs)
def GetWidth(*args, **kwargs):
"""GetWidth() -> int"""
"""GetWidth() -> int
Gets the width of the bitmap in pixels."""
return _gdi.Bitmap_GetWidth(*args, **kwargs)
def GetHeight(*args, **kwargs):
"""GetHeight() -> int"""
"""GetHeight() -> int
Gets the height of the bitmap in pixels."""
return _gdi.Bitmap_GetHeight(*args, **kwargs)
def GetDepth(*args, **kwargs):
"""GetDepth() -> int"""
"""GetDepth() -> int
Gets the colour depth of the bitmap. A value of 1 indicates a
monochrome bitmap."""
return _gdi.Bitmap_GetDepth(*args, **kwargs)
def ConvertToImage(*args, **kwargs):
"""ConvertToImage() -> Image"""
"""ConvertToImage() -> Image
Creates a platform-independent image from a platform-dependent bitmap. This
preserves mask information so that bitmaps and images can be converted back
and forth without loss in that respect."""
return _gdi.Bitmap_ConvertToImage(*args, **kwargs)
def GetMask(*args, **kwargs):
"""GetMask() -> Mask"""
"""GetMask() -> Mask
Gets the associated mask (if any) which may have been loaded from a file
or explpicitly set for the bitmap."""
return _gdi.Bitmap_GetMask(*args, **kwargs)
def SetMask(*args, **kwargs):
"""SetMask(Mask mask)"""
"""SetMask(Mask mask)
Sets the mask for this bitmap."""
return _gdi.Bitmap_SetMask(*args, **kwargs)
def SetMaskColour(*args, **kwargs):
"""SetMaskColour(Colour colour)"""
"""SetMaskColour(Colour colour)
Create a Mask based on a specified colour in the Bitmap."""
return _gdi.Bitmap_SetMaskColour(*args, **kwargs)
def GetSubBitmap(*args, **kwargs):
"""GetSubBitmap(Rect rect) -> Bitmap"""
"""GetSubBitmap(Rect rect) -> Bitmap
Returns a sub bitmap of the current one as long as the rect belongs entirely
to the bitmap. This function preserves bit depth and mask information."""
return _gdi.Bitmap_GetSubBitmap(*args, **kwargs)
def SaveFile(*args, **kwargs):
"""SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool"""
"""SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool
Saves a bitmap in the named file."""
return _gdi.Bitmap_SaveFile(*args, **kwargs)
def LoadFile(*args, **kwargs):
"""LoadFile(wxString name, wxBitmapType type) -> bool"""
"""LoadFile(wxString name, wxBitmapType type) -> bool
Loads a bitmap from a file"""
return _gdi.Bitmap_LoadFile(*args, **kwargs)
def CopyFromIcon(*args, **kwargs):
@ -390,15 +420,21 @@ class Bitmap(GDIObject):
return _gdi.Bitmap_CopyFromIcon(*args, **kwargs)
def SetHeight(*args, **kwargs):
"""SetHeight(int height)"""
"""SetHeight(int height)
Set the height property (does not affect the bitmap data)."""
return _gdi.Bitmap_SetHeight(*args, **kwargs)
def SetWidth(*args, **kwargs):
"""SetWidth(int width)"""
"""SetWidth(int width)
Set the width property (does not affect the bitmap data)."""
return _gdi.Bitmap_SetWidth(*args, **kwargs)
def SetDepth(*args, **kwargs):
"""SetDepth(int depth)"""
"""SetDepth(int depth)
Set the depth property (does not affect the bitmap data)."""
return _gdi.Bitmap_SetDepth(*args, **kwargs)
def __nonzero__(self): return self.Ok()
@ -411,41 +447,64 @@ class BitmapPtr(Bitmap):
_gdi.Bitmap_swigregister(BitmapPtr)
def EmptyBitmap(*args, **kwargs):
"""EmptyBitmap(int width, int height, int depth=-1) -> Bitmap"""
"""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"""
"""BitmapFromIcon(Icon icon) -> Bitmap
Create a new bitmap from an Icon object."""
val = _gdi.new_BitmapFromIcon(*args, **kwargs)
val.thisown = 1
return val
def BitmapFromImage(*args, **kwargs):
"""BitmapFromImage(Image image, int depth=-1) -> Bitmap"""
"""BitmapFromImage(Image image, int depth=-1) -> Bitmap
Creates bitmap object from the image. This has to be done to actually display
an image as you cannot draw an image directly on a window. The resulting
bitmap will use the provided colour depth (or that of the current system if
depth is -1) which entails that a colour reduction has to take place."""
val = _gdi.new_BitmapFromImage(*args, **kwargs)
val.thisown = 1
return val
def BitmapFromXPMData(*args, **kwargs):
"""BitmapFromXPMData(PyObject listOfStrings) -> Bitmap"""
"""BitmapFromXPMData(PyObject listOfStrings) -> Bitmap
Construct a Bitmap from a list of strings formatted as XPM data."""
val = _gdi.new_BitmapFromXPMData(*args, **kwargs)
val.thisown = 1
return val
def BitmapFromBits(*args, **kwargs):
"""BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap"""
"""BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap
Creates a bitmap from an array of bits. You should only use this function for
monochrome bitmaps (depth 1) in portable programs: in this case the bits
parameter should contain an XBM image. For other bit depths, the behaviour is
platform dependent."""
val = _gdi.new_BitmapFromBits(*args, **kwargs)
val.thisown = 1
return val
class Mask(core.Object):
""""""
"""This class encapsulates a monochrome mask bitmap, where the masked area is
black and the unmasked area is white. When associated with a bitmap and drawn
in a device context, the unmasked area of the bitmap will be drawn, and the
masked area will not be drawn."""
def __repr__(self):
return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Bitmap bitmap) -> Mask"""
"""__init__(Bitmap bitmap) -> Mask
Constructs a mask from a monochrome bitmap."""
newobj = _gdi.new_Mask(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -459,7 +518,10 @@ class MaskPtr(Mask):
_gdi.Mask_swigregister(MaskPtr)
def MaskColour(*args, **kwargs):
"""MaskColour(Bitmap bitmap, Colour colour) -> Mask"""
"""MaskColour(Bitmap bitmap, Colour colour) -> Mask
Constructs a mask from a bitmap and a colour in that bitmap that indicates the
background."""
val = _gdi.new_MaskColour(*args, **kwargs)
val.thisown = 1
return val

5
wxPython/src/gtk/gdi_wrap.cpp
View File

File diff suppressed because one or more lines are too long

50
wxPython/src/gtk/misc.py
View File

@ -2307,30 +2307,47 @@ class ArtProvider(object):
return _misc.ArtProvider__setCallbackInfo(*args, **kwargs)
def PushProvider(*args, **kwargs):
"""ArtProvider.PushProvider(ArtProvider provider)"""
"""ArtProvider.PushProvider(ArtProvider provider)
Add new provider to the top of providers stack."""
return _misc.ArtProvider_PushProvider(*args, **kwargs)
PushProvider = staticmethod(PushProvider)
def PopProvider(*args, **kwargs):
"""ArtProvider.PopProvider() -> bool"""
"""ArtProvider.PopProvider() -> bool
Remove latest added provider and delete it."""
return _misc.ArtProvider_PopProvider(*args, **kwargs)
PopProvider = staticmethod(PopProvider)
def RemoveProvider(*args, **kwargs):
"""ArtProvider.RemoveProvider(ArtProvider provider) -> bool"""
"""ArtProvider.RemoveProvider(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously!
The provider is _not_ deleted."""
return _misc.ArtProvider_RemoveProvider(*args, **kwargs)
RemoveProvider = staticmethod(RemoveProvider)
def GetBitmap(*args, **kwargs):
"""ArtProvider.GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap"""
"""ArtProvider.GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap
Query the providers for bitmap with given ID and return it. Return
wx.NullBitmap if no provider provides it."""
return _misc.ArtProvider_GetBitmap(*args, **kwargs)
GetBitmap = staticmethod(GetBitmap)
def GetIcon(*args, **kwargs):
"""ArtProvider.GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon"""
"""ArtProvider.GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon
Query the providers for icon with given ID and return it. Return
wx.NullIcon if no provider provides it."""
return _misc.ArtProvider_GetIcon(*args, **kwargs)
GetIcon = staticmethod(GetIcon)
def Destroy(*args, **kwargs):
"""Destroy()"""
return _misc.ArtProvider_Destroy(*args, **kwargs)
class ArtProviderPtr(ArtProvider):
def __init__(self, this):
@ -2378,23 +2395,36 @@ ART_INFORMATION = cvar.ART_INFORMATION
ART_MISSING_IMAGE = cvar.ART_MISSING_IMAGE
def ArtProvider_PushProvider(*args, **kwargs):
"""ArtProvider_PushProvider(ArtProvider provider)"""
"""ArtProvider_PushProvider(ArtProvider provider)
Add new provider to the top of providers stack."""
return _misc.ArtProvider_PushProvider(*args, **kwargs)
def ArtProvider_PopProvider(*args, **kwargs):
"""ArtProvider_PopProvider() -> bool"""
"""ArtProvider_PopProvider() -> bool
Remove latest added provider and delete it."""
return _misc.ArtProvider_PopProvider(*args, **kwargs)
def ArtProvider_RemoveProvider(*args, **kwargs):
"""ArtProvider_RemoveProvider(ArtProvider provider) -> bool"""
"""ArtProvider_RemoveProvider(ArtProvider provider) -> bool
Remove provider. The provider must have been added previously!
The provider is _not_ deleted."""
return _misc.ArtProvider_RemoveProvider(*args, **kwargs)
def ArtProvider_GetBitmap(*args, **kwargs):
"""ArtProvider_GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap"""
"""ArtProvider_GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap
Query the providers for bitmap with given ID and return it. Return
wx.NullBitmap if no provider provides it."""
return _misc.ArtProvider_GetBitmap(*args, **kwargs)
def ArtProvider_GetIcon(*args, **kwargs):
"""ArtProvider_GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon"""
"""ArtProvider_GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon
Query the providers for icon with given ID and return it. Return
wx.NullIcon if no provider provides it."""
return _misc.ArtProvider_GetIcon(*args, **kwargs)
#---------------------------------------------------------------------------

31
wxPython/src/gtk/misc_wrap.cpp
View File

@ -789,6 +789,7 @@ public:
PYPRIVATE;
};
void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; }
@ -13083,6 +13084,30 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj
}
static PyObject *_wrap_ArtProvider_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_Destroy",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyArtProvider,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyArtProvider_Destroy(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject * ArtProvider_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@ -24671,6 +24696,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS },
{ (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ConfigBase_Set", (PyCFunction) _wrap_ConfigBase_Set, METH_VARARGS | METH_KEYWORDS },
@ -25417,6 +25443,9 @@ static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) {
static void *_p_wxEvtHandlerTo_p_wxObject(void *x) {
return (void *)((wxObject *) ((wxEvtHandler *) x));
}
static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
return (void *)((wxObject *) ((wxAcceleratorTable *) x));
}
static void *_p_wxImageTo_p_wxObject(void *x) {
return (void *)((wxObject *) ((wxImage *) x));
}
@ -25598,7 +25627,7 @@ static swig_type_info _swigt__p_wxSystemOptions[] = {{"_p_wxSystemOptions", 0, "
static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
static swig_type_info _swigt__p_wxJoystickEvent[] = {{"_p_wxJoystickEvent", 0, "wxJoystickEvent *", 0},{"_p_wxJoystickEvent"},{0}};
static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}};
static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxFileHistory", _p_wxFileHistoryTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxClipboard", _p_wxClipboardTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxToolTip", _p_wxToolTipTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSystemOptions", _p_wxSystemOptionsTo_p_wxObject},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxBusyInfo", _p_wxBusyInfoTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxProcessEvent", _p_wxProcessEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxObject},{0}};
static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxFileHistory", _p_wxFileHistoryTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxClipboard", _p_wxClipboardTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxToolTip", _p_wxToolTipTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSystemOptions", _p_wxSystemOptionsTo_p_wxObject},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxBusyInfo", _p_wxBusyInfoTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxProcessEvent", _p_wxProcessEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxObject},{0}};
static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}};
static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0},{"_p_wxDateTime"},{0}};
static swig_type_info _swigt__p_wxPyDropSource[] = {{"_p_wxPyDropSource", 0, "wxPyDropSource *", 0},{"_p_wxPyDropSource"},{0}};

84
wxPython/src/gtk/windows.py
View File

@ -162,88 +162,6 @@ def PreScrolledWindow(*args, **kwargs):
#---------------------------------------------------------------------------
class AcceleratorEntry(object):
""""""
def __repr__(self):
return "<%s.%s; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(int flags=0, int keyCode=0, int cmd=0, MenuItem item=None) -> AcceleratorEntry"""
newobj = _windows.new_AcceleratorEntry(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_windows.delete_AcceleratorEntry):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Set(*args, **kwargs):
"""Set(int flags, int keyCode, int cmd, MenuItem item=None)"""
return _windows.AcceleratorEntry_Set(*args, **kwargs)
def SetMenuItem(*args, **kwargs):
"""SetMenuItem(MenuItem item)"""
return _windows.AcceleratorEntry_SetMenuItem(*args, **kwargs)
def GetMenuItem(*args, **kwargs):
"""GetMenuItem() -> MenuItem"""
return _windows.AcceleratorEntry_GetMenuItem(*args, **kwargs)
def GetFlags(*args, **kwargs):
"""GetFlags() -> int"""
return _windows.AcceleratorEntry_GetFlags(*args, **kwargs)
def GetKeyCode(*args, **kwargs):
"""GetKeyCode() -> int"""
return _windows.AcceleratorEntry_GetKeyCode(*args, **kwargs)
def GetCommand(*args, **kwargs):
"""GetCommand() -> int"""
return _windows.AcceleratorEntry_GetCommand(*args, **kwargs)
class AcceleratorEntryPtr(AcceleratorEntry):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = AcceleratorEntry
_windows.AcceleratorEntry_swigregister(AcceleratorEntryPtr)
class AcceleratorTable(core.Object):
""""""
def __repr__(self):
return "<%s.%s; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(int n, AcceleratorEntry entries) -> AcceleratorTable"""
newobj = _windows.new_AcceleratorTable(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_windows.delete_AcceleratorTable):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Ok(*args, **kwargs):
"""Ok() -> bool"""
return _windows.AcceleratorTable_Ok(*args, **kwargs)
class AcceleratorTablePtr(AcceleratorTable):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = AcceleratorTable
_windows.AcceleratorTable_swigregister(AcceleratorTablePtr)
def GetAccelFromString(*args, **kwargs):
"""GetAccelFromString(wxString label) -> AcceleratorEntry"""
return _windows.GetAccelFromString(*args, **kwargs)
#---------------------------------------------------------------------------
FULLSCREEN_NOMENUBAR = _windows.FULLSCREEN_NOMENUBAR
FULLSCREEN_NOTOOLBAR = _windows.FULLSCREEN_NOTOOLBAR
FULLSCREEN_NOSTATUSBAR = _windows.FULLSCREEN_NOSTATUSBAR
@ -315,8 +233,6 @@ class TopLevelWindowPtr(TopLevelWindow):
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = TopLevelWindow
_windows.TopLevelWindow_swigregister(TopLevelWindowPtr)
cvar = _windows.cvar
NullAcceleratorTable = cvar.NullAcceleratorTable
#---------------------------------------------------------------------------

567
wxPython/src/gtk/windows_wrap.cpp
View File

@ -218,90 +218,87 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con
#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[0]
#define SWIGTYPE_p_wxPreviewFrame swig_types[1]
#define SWIGTYPE_p_wxPyPreviewFrame swig_types[2]
#define SWIGTYPE_p_wxAcceleratorEntry swig_types[3]
#define SWIGTYPE_p_wxPyPanel swig_types[4]
#define SWIGTYPE_p_wxMenu swig_types[5]
#define SWIGTYPE_p_wxPrintData swig_types[6]
#define SWIGTYPE_p_wxFontData swig_types[7]
#define SWIGTYPE_p_wxEvent swig_types[8]
#define SWIGTYPE_p_wxTaskBarIcon swig_types[9]
#define SWIGTYPE_p_wxIconBundle swig_types[10]
#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[11]
#define SWIGTYPE_p_wxFindDialogEvent swig_types[12]
#define SWIGTYPE_p_wxPreviewCanvas swig_types[13]
#define SWIGTYPE_p_wxFont swig_types[14]
#define SWIGTYPE_p_wxSplitterEvent swig_types[15]
#define SWIGTYPE_p_wxRegion swig_types[16]
#define SWIGTYPE_p_wxFindReplaceData swig_types[17]
#define SWIGTYPE_p_int swig_types[18]
#define SWIGTYPE_p_wxSize swig_types[19]
#define SWIGTYPE_p_wxDC swig_types[20]
#define SWIGTYPE_p_wxIcon swig_types[21]
#define SWIGTYPE_p_wxMDIChildFrame swig_types[22]
#define SWIGTYPE_p_wxColourData swig_types[23]
#define SWIGTYPE_p_wxNotifyEvent swig_types[24]
#define SWIGTYPE_p_wxPyWindow swig_types[25]
#define SWIGTYPE_p_wxSplashScreen swig_types[26]
#define SWIGTYPE_p_wxFindReplaceDialog swig_types[27]
#define SWIGTYPE_p_wxProgressDialog swig_types[28]
#define SWIGTYPE_p_wxMessageDialog swig_types[29]
#define SWIGTYPE_p_wxTextEntryDialog swig_types[30]
#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[31]
#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[32]
#define SWIGTYPE_p_wxFileDialog swig_types[33]
#define SWIGTYPE_p_wxPrinter swig_types[34]
#define SWIGTYPE_p_wxMenuItem swig_types[35]
#define SWIGTYPE_p_wxArrayInt swig_types[36]
#define SWIGTYPE_p_wxEvtHandler swig_types[37]
#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[38]
#define SWIGTYPE_p_wxPyHtmlListBox swig_types[39]
#define SWIGTYPE_p_wxPyVListBox swig_types[40]
#define SWIGTYPE_p_wxRect swig_types[41]
#define SWIGTYPE_p_wxAcceleratorTable swig_types[42]
#define SWIGTYPE_p_wxMiniFrame swig_types[43]
#define SWIGTYPE_p_wxFrame swig_types[44]
#define SWIGTYPE_p_wxPyPrintout swig_types[45]
#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[46]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[47]
#define SWIGTYPE_p_wxStatusBar swig_types[48]
#define SWIGTYPE_p_wxMDIParentFrame swig_types[49]
#define SWIGTYPE_p_wxPoint swig_types[50]
#define SWIGTYPE_p_wxObject swig_types[51]
#define SWIGTYPE_p_unsigned_long swig_types[52]
#define SWIGTYPE_p_wxMDIClientWindow swig_types[53]
#define SWIGTYPE_p_wxTipWindow swig_types[54]
#define SWIGTYPE_p_wxSashLayoutWindow swig_types[55]
#define SWIGTYPE_p_wxSplitterWindow swig_types[56]
#define SWIGTYPE_p_wxSplashScreenWindow swig_types[57]
#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[58]
#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[59]
#define SWIGTYPE_p_wxPopupWindow swig_types[60]
#define SWIGTYPE_p_wxSashWindow swig_types[61]
#define SWIGTYPE_p_wxTopLevelWindow swig_types[62]
#define SWIGTYPE_p_wxWindow swig_types[63]
#define SWIGTYPE_p_wxScrolledWindow swig_types[64]
#define SWIGTYPE_p_wxMenuBar swig_types[65]
#define SWIGTYPE_p_wxPrintPreview swig_types[66]
#define SWIGTYPE_p_wxSashEvent swig_types[67]
#define SWIGTYPE_p_wxString swig_types[68]
#define SWIGTYPE_p_wxPyPrintPreview swig_types[69]
#define SWIGTYPE_p_wxFontDialog swig_types[70]
#define SWIGTYPE_p_wxDirDialog swig_types[71]
#define SWIGTYPE_p_wxColourDialog swig_types[72]
#define SWIGTYPE_p_wxDialog swig_types[73]
#define SWIGTYPE_p_wxPanel swig_types[74]
#define SWIGTYPE_p_wxPageSetupDialog swig_types[75]
#define SWIGTYPE_p_wxPrintDialog swig_types[76]
#define SWIGTYPE_p_wxBitmap swig_types[77]
#define SWIGTYPE_p_wxCommandEvent swig_types[78]
#define SWIGTYPE_p_wxPrintQuality swig_types[79]
#define SWIGTYPE_p_wxPreviewControlBar swig_types[80]
#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81]
#define SWIGTYPE_p_wxColour swig_types[82]
#define SWIGTYPE_p_wxToolBar swig_types[83]
#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84]
#define SWIGTYPE_p_wxPrintDialogData swig_types[85]
static swig_type_info *swig_types[87];
#define SWIGTYPE_p_wxPyPanel swig_types[3]
#define SWIGTYPE_p_wxMenu swig_types[4]
#define SWIGTYPE_p_wxPrintData swig_types[5]
#define SWIGTYPE_p_wxFontData swig_types[6]
#define SWIGTYPE_p_wxEvent swig_types[7]
#define SWIGTYPE_p_wxTaskBarIcon swig_types[8]
#define SWIGTYPE_p_wxIconBundle swig_types[9]
#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[10]
#define SWIGTYPE_p_wxFindDialogEvent swig_types[11]
#define SWIGTYPE_p_wxPreviewCanvas swig_types[12]
#define SWIGTYPE_p_wxFont swig_types[13]
#define SWIGTYPE_p_wxSplitterEvent swig_types[14]
#define SWIGTYPE_p_wxRegion swig_types[15]
#define SWIGTYPE_p_wxFindReplaceData swig_types[16]
#define SWIGTYPE_p_int swig_types[17]
#define SWIGTYPE_p_wxSize swig_types[18]
#define SWIGTYPE_p_wxDC swig_types[19]
#define SWIGTYPE_p_wxIcon swig_types[20]
#define SWIGTYPE_p_wxMDIChildFrame swig_types[21]
#define SWIGTYPE_p_wxColourData swig_types[22]
#define SWIGTYPE_p_wxNotifyEvent swig_types[23]
#define SWIGTYPE_p_wxPyWindow swig_types[24]
#define SWIGTYPE_p_wxSplashScreen swig_types[25]
#define SWIGTYPE_p_wxFindReplaceDialog swig_types[26]
#define SWIGTYPE_p_wxProgressDialog swig_types[27]
#define SWIGTYPE_p_wxMessageDialog swig_types[28]
#define SWIGTYPE_p_wxTextEntryDialog swig_types[29]
#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[30]
#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[31]
#define SWIGTYPE_p_wxFileDialog swig_types[32]
#define SWIGTYPE_p_wxPrinter swig_types[33]
#define SWIGTYPE_p_wxArrayInt swig_types[34]
#define SWIGTYPE_p_wxEvtHandler swig_types[35]
#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[36]
#define SWIGTYPE_p_wxPyHtmlListBox swig_types[37]
#define SWIGTYPE_p_wxPyVListBox swig_types[38]
#define SWIGTYPE_p_wxRect swig_types[39]
#define SWIGTYPE_p_wxMiniFrame swig_types[40]
#define SWIGTYPE_p_wxFrame swig_types[41]
#define SWIGTYPE_p_wxPyPrintout swig_types[42]
#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[43]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[44]
#define SWIGTYPE_p_wxStatusBar swig_types[45]
#define SWIGTYPE_p_wxMDIParentFrame swig_types[46]
#define SWIGTYPE_p_wxPoint swig_types[47]
#define SWIGTYPE_p_wxObject swig_types[48]
#define SWIGTYPE_p_unsigned_long swig_types[49]
#define SWIGTYPE_p_wxMDIClientWindow swig_types[50]
#define SWIGTYPE_p_wxTipWindow swig_types[51]
#define SWIGTYPE_p_wxSashLayoutWindow swig_types[52]
#define SWIGTYPE_p_wxSplitterWindow swig_types[53]
#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[54]
#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[55]
#define SWIGTYPE_p_wxPopupWindow swig_types[56]
#define SWIGTYPE_p_wxSashWindow swig_types[57]
#define SWIGTYPE_p_wxTopLevelWindow swig_types[58]
#define SWIGTYPE_p_wxWindow swig_types[59]
#define SWIGTYPE_p_wxScrolledWindow swig_types[60]
#define SWIGTYPE_p_wxSplashScreenWindow swig_types[61]
#define SWIGTYPE_p_wxMenuBar swig_types[62]
#define SWIGTYPE_p_wxPrintPreview swig_types[63]
#define SWIGTYPE_p_wxSashEvent swig_types[64]
#define SWIGTYPE_p_wxString swig_types[65]
#define SWIGTYPE_p_wxPyPrintPreview swig_types[66]
#define SWIGTYPE_p_wxPageSetupDialog swig_types[67]
#define SWIGTYPE_p_wxFontDialog swig_types[68]
#define SWIGTYPE_p_wxDirDialog swig_types[69]
#define SWIGTYPE_p_wxColourDialog swig_types[70]
#define SWIGTYPE_p_wxDialog swig_types[71]
#define SWIGTYPE_p_wxPanel swig_types[72]
#define SWIGTYPE_p_wxPrintDialog swig_types[73]
#define SWIGTYPE_p_wxBitmap swig_types[74]
#define SWIGTYPE_p_wxCommandEvent swig_types[75]
#define SWIGTYPE_p_wxPrintQuality swig_types[76]
#define SWIGTYPE_p_wxPreviewControlBar swig_types[77]
#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[78]
#define SWIGTYPE_p_wxColour swig_types[79]
#define SWIGTYPE_p_wxToolBar swig_types[80]
#define SWIGTYPE_p_wxPageSetupDialogData swig_types[81]
#define SWIGTYPE_p_wxPrintDialogData swig_types[82]
static swig_type_info *swig_types[84];
/* -------- TYPES TABLE (END) -------- */
@ -2045,372 +2042,6 @@ static PyObject * ScrolledWindow_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) 0 ;
int arg2 = (int) 0 ;
int arg3 = (int) 0 ;
wxMenuItem *arg4 = (wxMenuItem *) NULL ;
wxAcceleratorEntry *result;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail;
if (obj3) {
if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int arg2 ;
int arg3 ;
int arg4 ;
wxMenuItem *arg5 = (wxMenuItem *) NULL ;
PyObject * obj0 = 0 ;
PyObject * obj4 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (obj4) {
if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Set(arg2,arg3,arg4,arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
wxMenuItem *arg2 = (wxMenuItem *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetMenuItem(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
wxMenuItem *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetFlags();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetKeyCode();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)(arg1)->GetCommand();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj);
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
wxAcceleratorTable *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "n", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail;
{
arg2 = wxAcceleratorEntry_LIST_helper(obj0);
if (arg2) arg1 = PyList_Size(obj0);
else arg1 = 0;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorTable *)new wxAcceleratorTable(arg1,(wxAcceleratorEntry const *)arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorTable, 1);
{
delete [] arg2;
}
return resultobj;
fail:
{
delete [] arg2;
}
return NULL;
}
static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxAcceleratorTable const *)arg1)->Ok();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj);
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static int _wrap_NullAcceleratorTable_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only.");
return 1;
}
static PyObject *_wrap_NullAcceleratorTable_get() {
PyObject *pyobj;
pyobj = SWIG_NewPointerObj((void *) &wxNullAcceleratorTable, SWIGTYPE_p_wxAcceleratorTable, 0);
return pyobj;
}
static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString *arg1 = 0 ;
wxAcceleratorEntry *result;
bool temp1 = False ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "label", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = True;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAcceleratorEntry *)wxGetAccelFromString((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 0);
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
@ -20966,20 +20597,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ScrolledWindow_GetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_GetTargetWindow, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ScrolledWindow_swigregister", ScrolledWindow_swigregister, METH_VARARGS },
{ (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS },
{ (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS },
{ (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS },
{ (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TopLevelWindow_Maximize", (PyCFunction) _wrap_TopLevelWindow_Maximize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TopLevelWindow_Restore", (PyCFunction) _wrap_TopLevelWindow_Restore, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TopLevelWindow_Iconize", (PyCFunction) _wrap_TopLevelWindow_Iconize, METH_VARARGS | METH_KEYWORDS },
@ -22190,9 +21807,6 @@ static void *_p_wxNavigationKeyEventTo_p_wxObject(void *x) {
static void *_p_wxKeyEventTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvent *) ((wxKeyEvent *) x));
}
static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
}
static void *_p_wxWindowTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *) ((wxWindow *) x));
}
@ -22202,6 +21816,9 @@ static void *_p_wxMenuTo_p_wxObject(void *x) {
static void *_p_wxMenuBarTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x));
}
static void *_p_wxScrolledWindowTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x));
}
static void *_p_wxTopLevelWindowTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxTopLevelWindow *) x));
}
@ -22628,7 +22245,6 @@ static void *_p_wxPyPreviewControlBarTo_p_wxPreviewControlBar(void *x) {
static swig_type_info _swigt__p_wxQueryLayoutInfoEvent[] = {{"_p_wxQueryLayoutInfoEvent", 0, "wxQueryLayoutInfoEvent *", 0},{"_p_wxQueryLayoutInfoEvent"},{0}};
static swig_type_info _swigt__p_wxPreviewFrame[] = {{"_p_wxPreviewFrame", 0, "wxPreviewFrame *", 0},{"_p_wxPreviewFrame"},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxPreviewFrame},{0}};
static swig_type_info _swigt__p_wxPyPreviewFrame[] = {{"_p_wxPyPreviewFrame", 0, "wxPyPreviewFrame *", 0},{"_p_wxPyPreviewFrame"},{0}};
static swig_type_info _swigt__p_wxAcceleratorEntry[] = {{"_p_wxAcceleratorEntry", 0, "wxAcceleratorEntry *", 0},{"_p_wxAcceleratorEntry"},{0}};
static swig_type_info _swigt__p_wxPyPanel[] = {{"_p_wxPyPanel", 0, "wxPyPanel *", 0},{"_p_wxPyPanel"},{0}};
static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0},{"_p_wxMenu"},{0}};
static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0},{"_p_wxPrintData"},{0}};
@ -22660,14 +22276,12 @@ static swig_type_info _swigt__p_wxSingleChoiceDialog[] = {{"_p_wxSingleChoiceDia
static swig_type_info _swigt__p_wxMultiChoiceDialog[] = {{"_p_wxMultiChoiceDialog", 0, "wxMultiChoiceDialog *", 0},{"_p_wxMultiChoiceDialog"},{0}};
static swig_type_info _swigt__p_wxFileDialog[] = {{"_p_wxFileDialog", 0, "wxFileDialog *", 0},{"_p_wxFileDialog"},{0}};
static swig_type_info _swigt__p_wxPrinter[] = {{"_p_wxPrinter", 0, "wxPrinter *", 0},{"_p_wxPrinter"},{0}};
static swig_type_info _swigt__p_wxMenuItem[] = {{"_p_wxMenuItem", 0, "wxMenuItem *", 0},{"_p_wxMenuItem"},{0}};
static swig_type_info _swigt__p_wxArrayInt[] = {{"_p_wxArrayInt", 0, "wxArrayInt *", 0},{"_p_wxArrayInt"},{0}};
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}};
static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayoutEvent", 0, "wxCalculateLayoutEvent *", 0},{"_p_wxCalculateLayoutEvent"},{0}};
static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0},{"_p_wxPyHtmlListBox"},{0}};
static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0},{"_p_wxPyVListBox"},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox},{0}};
static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}};
static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0},{"_p_wxAcceleratorTable"},{0}};
static swig_type_info _swigt__p_wxMiniFrame[] = {{"_p_wxMiniFrame", 0, "wxMiniFrame *", 0},{"_p_wxMiniFrame"},{0}};
static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxFrame},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxFrame},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxFrame},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxFrame},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxFrame},{"_p_wxFrame"},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxFrame},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxFrame},{0}};
static swig_type_info _swigt__p_wxPyPrintout[] = {{"_p_wxPyPrintout", 0, "wxPyPrintout *", 0},{"_p_wxPyPrintout"},{0}};
@ -22682,7 +22296,6 @@ static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow",
static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0},{"_p_wxTipWindow"},{0}};
static swig_type_info _swigt__p_wxSashLayoutWindow[] = {{"_p_wxSashLayoutWindow", 0, "wxSashLayoutWindow *", 0},{"_p_wxSashLayoutWindow"},{0}};
static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{0}};
static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}};
static swig_type_info _swigt__p_wxPyVScrolledWindow[] = {{"_p_wxPyVScrolledWindow", 0, "wxPyVScrolledWindow *", 0},{"_p_wxPyVScrolledWindow"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPyVScrolledWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow},{0}};
static swig_type_info _swigt__p_wxPyPopupTransientWindow[] = {{"_p_wxPyPopupTransientWindow", 0, "wxPyPopupTransientWindow *", 0},{"_p_wxPyPopupTransientWindow"},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPyPopupTransientWindow},{0}};
static swig_type_info _swigt__p_wxPopupWindow[] = {{"_p_wxPopupWindow", 0, "wxPopupWindow *", 0},{"_p_wxPopupWindow"},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxPopupWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPopupWindow},{0}};
@ -22690,17 +22303,18 @@ static swig_type_info _swigt__p_wxSashWindow[] = {{"_p_wxSashWindow", 0, "wxSash
static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow},{"_p_wxTopLevelWindow"},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow},{0}};
static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}};
static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}};
static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}};
static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0},{"_p_wxMenuBar"},{0}};
static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0},{"_p_wxPrintPreview"},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview},{0}};
static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0},{"_p_wxSashEvent"},{0}};
static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
static swig_type_info _swigt__p_wxPyPrintPreview[] = {{"_p_wxPyPrintPreview", 0, "wxPyPrintPreview *", 0},{"_p_wxPyPrintPreview"},{0}};
static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}};
static swig_type_info _swigt__p_wxFontDialog[] = {{"_p_wxFontDialog", 0, "wxFontDialog *", 0},{"_p_wxFontDialog"},{0}};
static swig_type_info _swigt__p_wxDirDialog[] = {{"_p_wxDirDialog", 0, "wxDirDialog *", 0},{"_p_wxDirDialog"},{0}};
static swig_type_info _swigt__p_wxColourDialog[] = {{"_p_wxColourDialog", 0, "wxColourDialog *", 0},{"_p_wxColourDialog"},{0}};
static swig_type_info _swigt__p_wxDialog[] = {{"_p_wxDialog", 0, "wxDialog *", 0},{"_p_wxDialog"},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxDialog},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxDialog},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxDialog},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxDialog},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxDialog},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxDialog},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxDialog},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxDialog},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxDialog},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxDialog},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxDialog},{0}};
static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}};
static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}};
static swig_type_info _swigt__p_wxPrintDialog[] = {{"_p_wxPrintDialog", 0, "wxPrintDialog *", 0},{"_p_wxPrintDialog"},{0}};
static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}};
static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent},{0}};
@ -22716,7 +22330,6 @@ static swig_type_info *swig_types_initial[] = {
_swigt__p_wxQueryLayoutInfoEvent,
_swigt__p_wxPreviewFrame,
_swigt__p_wxPyPreviewFrame,
_swigt__p_wxAcceleratorEntry,
_swigt__p_wxPyPanel,
_swigt__p_wxMenu,
_swigt__p_wxPrintData,
@ -22748,14 +22361,12 @@ _swigt__p_wxSingleChoiceDialog,
_swigt__p_wxMultiChoiceDialog,
_swigt__p_wxFileDialog,
_swigt__p_wxPrinter,
_swigt__p_wxMenuItem,
_swigt__p_wxArrayInt,
_swigt__p_wxEvtHandler,
_swigt__p_wxCalculateLayoutEvent,
_swigt__p_wxPyHtmlListBox,
_swigt__p_wxPyVListBox,
_swigt__p_wxRect,
_swigt__p_wxAcceleratorTable,
_swigt__p_wxMiniFrame,
_swigt__p_wxFrame,
_swigt__p_wxPyPrintout,
@ -22770,7 +22381,6 @@ _swigt__p_wxMDIClientWindow,
_swigt__p_wxTipWindow,
_swigt__p_wxSashLayoutWindow,
_swigt__p_wxSplitterWindow,
_swigt__p_wxSplashScreenWindow,
_swigt__p_wxPyVScrolledWindow,
_swigt__p_wxPyPopupTransientWindow,
_swigt__p_wxPopupWindow,
@ -22778,17 +22388,18 @@ _swigt__p_wxSashWindow,
_swigt__p_wxTopLevelWindow,
_swigt__p_wxWindow,
_swigt__p_wxScrolledWindow,
_swigt__p_wxSplashScreenWindow,
_swigt__p_wxMenuBar,
_swigt__p_wxPrintPreview,
_swigt__p_wxSashEvent,
_swigt__p_wxString,
_swigt__p_wxPyPrintPreview,
_swigt__p_wxPageSetupDialog,
_swigt__p_wxFontDialog,
_swigt__p_wxDirDialog,
_swigt__p_wxColourDialog,
_swigt__p_wxDialog,
_swigt__p_wxPanel,
_swigt__p_wxPageSetupDialog,
_swigt__p_wxPrintDialog,
_swigt__p_wxBitmap,
_swigt__p_wxCommandEvent,
@ -22941,8 +22552,6 @@ SWIGEXPORT(void) SWIG_init(void) {
}
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED));
PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING));
PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED));

1
wxPython/src/windows.i
View File

@ -34,7 +34,6 @@
// Include all the files that make up this module
%include _panel.i
%include _accel.i
%include _toplvl.i
%include _statusbar.i
%include _splitter.i

4
wxPython/wxPython/core.py
View File

@ -899,6 +899,10 @@ wxWakeUpIdle = wx.core.WakeUpIdle
wxPostEvent = wx.core.PostEvent
wxApp_CleanUp = wx.core.App_CleanUp
wxGetApp = wx.core.GetApp
wxAcceleratorEntry = wx.core.AcceleratorEntry
wxAcceleratorTable = wx.core.AcceleratorTable
wxNullAcceleratorTable = wx.core.NullAcceleratorTable
wxGetAccelFromString = wx.core.GetAccelFromString
wxPanelNameStr = wx.core.PanelNameStr
wxPreWindow = wx.core.PreWindow
wxWindow_NewControlId = wx.core.Window_NewControlId

4
wxPython/wxPython/windows.py
View File

@ -23,10 +23,6 @@ wxPrePanel = wx.windows.PrePanel
wxPanel = wx.windows.Panel
wxPreScrolledWindow = wx.windows.PreScrolledWindow
wxScrolledWindow = wx.windows.ScrolledWindow
wxAcceleratorEntry = wx.windows.AcceleratorEntry
wxAcceleratorTable = wx.windows.AcceleratorTable
wxNullAcceleratorTable = wx.windows.NullAcceleratorTable
wxGetAccelFromString = wx.windows.GetAccelFromString
wxFULLSCREEN_NOMENUBAR = wx.windows.FULLSCREEN_NOMENUBAR
wxFULLSCREEN_NOTOOLBAR = wx.windows.FULLSCREEN_NOTOOLBAR
wxFULLSCREEN_NOSTATUSBAR = wx.windows.FULLSCREEN_NOSTATUSBAR