%{
#include "helpers.h"
#include <wx/menuitem.h>
+#include <wx/tooltip.h>
%}
//----------------------------------------------------------------------
%pragma(python) code = "import wx"
-%{
- static wxString wxPyEmptyStr("");
-%}
-
//---------------------------------------------------------------------------
-class wxEvtHandler {
+class wxEvtHandler : public wxObject {
public:
wxEvtHandler();
(wxObjectEventFunction) &wxPyCallback::EventThunker,
new wxPyCallback(func));
}
+ else if (func == Py_None) {
+ self->Disconnect(id, lastId, eventType,
+ (wxObjectEventFunction)
+ &wxPyCallback::EventThunker);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+ }
}
bool Disconnect(int id, int lastId = -1,
(wxObjectEventFunction)
&wxPyCallback::EventThunker);
}
+ }
- // This really belongs in the wxObject base class. It's probably
- // time to actually add it...
- const char* GetClassName() {
- return self->GetClassInfo()->GetClassName();
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyClientData(_self));
}
}
-
-// %pragma(python) addtoclass = "
-// _prop_list_ = {}
-// "
-// %pragma(python) addtoclass = "
-// def __getattr__(self, name):
-// pl = self._prop_list_
-// if pl.has_key(name):
-// getFunc, setFunc = pl[name]
-// if getFunc:
-// return getattr(self, getFunc)()
-// else:
-// raise TypeError, '%s property is write-only' % name
-// raise AttributeError, name
-
-// def __setattr__(self, name, value):
-// pl = self._prop_list_
-// if pl.has_key(name):
-// getFunc, setFunc = pl[name]
-// if setFunc:
-// return getattr(self, setFunc)(value)
-// else:
-// raise TypeError, '%s property is read-only' % name
-// self.__dict__[name] = value
-// "
};
wxValidator();
//~wxValidator();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
wxValidator* Clone();
wxWindow* GetWindow();
void SetWindow(wxWindow* window);
-// // Properties list
-// %pragma(python) addtoclass = "
-// _prop_list_ = {
-// 'window' : ('GetWindow', 'SetWindow'),
-// }
-// _prop_list_.update(wxEvtHandler._prop_list_)
-// "
-};
+ static bool IsSilent();
+ static void SetBellOnError(int doIt = TRUE);
-%inline %{
- bool wxValidator_IsSilent() {
- return wxValidator::IsSilent();
- }
+};
- void wxValidator_SetBellOnError(int doIt = TRUE) {
- wxValidator::SetBellOnError(doIt);
- }
-%}
//----------------------------------------------------------------------
%{
public:
wxPyValidator() {
}
-// wxPyValidator(const wxPyValidator& other);
~wxPyValidator() {
}
- wxObject* wxPyValidator::Clone() const {
+ wxObject* Clone() const {
wxPyValidator* ptr = NULL;
wxPyValidator* self = (wxPyValidator*)this;
- bool doSave = wxPyRestoreThread();
+ wxPyBeginBlockThreads();
if (self->m_myInst.findCallback("Clone")) {
PyObject* ro;
ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
Py_DECREF(ro);
}
}
+ wxPyEndBlockThreads();
+
// This is very dangerous!!! But is the only way I could find
// to squash a memory leak. Currently it is okay, but if the
// validator architecture in wxWindows ever changes, problems
// could arise.
delete self;
-
- wxPySaveThread(doSave);
return ptr;
}
+
DEC_PYCALLBACK_BOOL_WXWIN(Validate);
DEC_PYCALLBACK_BOOL_(TransferToWindow);
DEC_PYCALLBACK_BOOL_(TransferFromWindow);
PYPRIVATE;
-// PyObject* m_data;
};
IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate);
class wxPyValidator : public wxValidator {
public:
wxPyValidator();
-// ~wxPyValidator();
- %addmethods { void Destroy() { delete self; } }
-
- void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
- %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 0)"
+ void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=TRUE);
+ %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyValidator, 1)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
//----------------------------------------------------------------------
class wxWindow : public wxEvtHandler {
public:
-
wxWindow(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
char* name = "panel");
+ %name(wxPreWindow)wxWindow();
+
+ bool Create(wxWindow* parent, const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ char* name = "panel");
+
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
void CaptureMouse();
void Center(int direction = wxBOTH);
void CentreOnScreen(int direction = wxBOTH );
void CenterOnScreen(int direction = wxBOTH );
+ void Clear();
+
// (uses apply'ed INOUT typemap, see above)
%name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
wxPoint ClientToScreen(const wxPoint& pt);
bool Close(int force = FALSE);
bool Destroy();
void DestroyChildren();
+ bool IsBeingDeleted();
#ifdef __WXMSW__
void DragAcceptFiles(bool accept);
#endif
%name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
void Fit();
wxColour GetBackgroundColour();
+ wxBorder GetBorder() const;
//wxList& GetChildren();
%addmethods {
int GetCharWidth();
%name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
wxSize GetClientSize();
+
+ // get the origin of the client area of the window relative to the
+ // window top left corner (the client area may be shifted because of
+ // the borders, scrollbars, other decorations...)
+ wxPoint GetClientAreaOrigin() const;
+
+ // get the client rectangle in window (i.e. client) coordinates
+ wxRect GetClientRect() const;
+
wxLayoutConstraints * GetConstraints();
wxEvtHandler* GetEventHandler();
- wxFont& GetFont();
+ wxFont GetFont();
wxColour GetForegroundColour();
wxWindow * GetGrandParent();
%addmethods {
long GetWindowStyleFlag();
void SetWindowStyleFlag(long style);
void SetWindowStyle(long style);
+ bool HasScrollbar(int orient) const;
bool Hide();
+ wxHitTest HitTest(const wxPoint& pt);
void InitDialog();
bool IsEnabled();
bool IsExposed( int x, int y, int w=0, int h=0 );
void Layout();
bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
void Lower();
- void MakeModal(bool flag);
- %name(MoveXY)void Move(int x, int y);
- void Move(const wxPoint& point);
+ void MakeModal(bool flag=TRUE);
+ %name(MoveXY)void Move(int x, int y, int flags = wxSIZE_USE_EXISTING);
+ void Move(const wxPoint& point, int flags = wxSIZE_USE_EXISTING);
wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
void PushEventHandler(wxEvtHandler* handler);
+ // find the given handler in the event handler chain and remove (but
+ // not delete) it from the event handler chain, return TRUE if it was
+ // found and FALSE otherwise (this also results in an assert failure so
+ // this function should only be called when the handler is supposed to
+ // be there)
+ bool RemoveEventHandler(wxEvtHandler *handler);
+
%name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
bool PopupMenu(wxMenu *menu, const wxPoint& pos);
void Raise();
void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
+ void RefreshRect(const wxRect& rect);
+
void ReleaseMouse();
void RemoveChild(wxWindow* child);
bool Reparent( wxWindow* newParent );
wxPoint ScreenToClient(const wxPoint& pt);
void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
- void SetAcceleratorTable(const wxAcceleratorTable& accel);
void SetAutoLayout(bool autoLayout);
bool GetAutoLayout();
void SetBackgroundColour(const wxColour& colour);
self->SetSize(size);
}
- void SetPosition(const wxPoint& pos) {
- self->Move(pos);
+ void SetPosition(const wxPoint& pos, int flags = wxSIZE_USE_EXISTING) {
+ self->Move(pos, flags);
}
void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
%name(SetClientSizeWH)void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size);
//void SetPalette(wxPalette* palette);
- void SetCursor(const wxCursor&cursor);
+ void SetCursor(const wxCursor& cursor);
void SetEventHandler(wxEvtHandler* handler);
void SetExtraStyle(long exStyle);
void SetTitle(const wxString& title);
- bool Show(bool show);
+ bool Show(bool show=TRUE);
bool TransferDataFromWindow();
bool TransferDataToWindow();
+ void UpdateWindowUI();
bool Validate();
void WarpPointer(int x, int y);
void SetSizer(wxSizer* sizer);
wxSizer* GetSizer();
+ // Track if this window is a member of a sizer
+ void SetContainingSizer(wxSizer* sizer);
+ wxSizer *GetContainingSizer() const;
+
wxValidator* GetValidator();
void SetValidator(const wxValidator& validator);
+#ifndef __WXMAC__
void SetDropTarget(wxDropTarget* target);
wxDropTarget* GetDropTarget();
%pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
+#endif
wxSize GetBestSize();
void SetCaret(wxCaret *caret);
wxCaret *GetCaret();
- %pragma(python) addtoclass = "# replaces broken shadow methods
+ %pragma(python) addtoclass = "# replaces broken shadow method
def GetCaret(self, *_args, **_kwargs):
from misc2 import wxCaretPtr
val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
if val: val = wxCaretPtr(val)
return val
+ "
- def GetSizer(self, *_args, **_kwargs):
- from sizers import wxSizerPtr
- val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
- if val: val = wxSizerPtr(val)
- return val
+ void Freeze();
+ void Thaw();
+ void Update();
- def GetToolTip(self, *_args, **_kwargs):
- from misc2 import wxToolTipPtr
- val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
- if val: val = wxToolTipPtr(val)
- return val
- "
+ wxString GetHelpText();
+ void SetHelpText(const wxString& helpText);
+ void SetHelpTextForId(const wxString& text);
+ bool ScrollLines(int lines);
+ bool ScrollPages(int pages);
+ bool LineUp();
+ bool LineDown();
+ bool PageUp();
+ bool PageDown();
-// // Properties list
-// %pragma(python) addtoclass = "
-// _prop_list_ = {
-// 'size' : ('GetSize', 'SetSize'),
-// 'enabled' : ('IsEnabled', 'Enable'),
-// 'background' : ('GetBackgroundColour', 'SetBackgroundColour'),
-// 'foreground' : ('GetForegroundColour', 'SetForegroundColour'),
-// 'children' : ('GetChildren', None),
-// 'charHeight' : ('GetCharHeight', None),
-// 'charWidth' : ('GetCharWidth', None),
-// 'clientSize' : ('GetClientSize', 'SetClientSize'),
-// 'font' : ('GetFont', 'SetFont'),
-// 'grandParent' : ('GetGrandParent', None),
-// 'handle' : ('GetHandle', None),
-// 'label' : ('GetLabel', 'SetLabel'),
-// 'name' : ('GetName', 'SetName'),
-// 'parent' : ('GetParent', None),
-// 'position' : ('GetPosition', 'SetPosition'),
-// 'title' : ('GetTitle', 'SetTitle'),
-// 'style' : ('GetWindowStyleFlag', 'SetWindowStyleFlag'),
-// 'visible' : ('IsShown', 'Show'),
-// 'toolTip' : ('GetToolTip', 'SetToolTip'),
-// 'sizer' : ('GetSizer', 'SetSizer'),
-// 'validator' : ('GetValidator', 'SetValidator'),
-// 'dropTarget' : ('GetDropTarget', 'SetDropTarget'),
-// 'caret' : ('GetCaret', 'SetCaret'),
-// 'autoLayout' : ('GetAutoLayout', 'SetAutoLayout'),
-// 'constraints' : ('GetConstraints', 'SetConstraints'),
-
-// }
-// _prop_list_.update(wxEvtHandler._prop_list_)
-// "
+ static wxWindow* FindFocus();
+ static int NewControlId();
+ static int NextControlId(int id);
+ static int PrevControlId(int id);
+
+ void SetAcceleratorTable(const wxAcceleratorTable& accel);
+ wxAcceleratorTable *GetAcceleratorTable();
+
+#ifdef __WXMSW__
+ // A way to do the native draw first... Too bad it isn't in wxGTK too.
+ void OnPaint(wxPaintEvent& event);
+#endif
+
+ wxButton* GetDefaultItem();
+ void SetDefaultItem(wxButton *btn);
};
return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
"
-%inline %{
- wxWindow* wxWindow_FindFocus() {
- return wxWindow::FindFocus();
- }
-%}
-
#ifdef __WXMSW__
%inline %{
%}
#endif
-%inline %{
- int wxWindow_NewControlId() {
- return wxWindow::NewControlId();
- }
- int wxWindow_NextControlId(int id) {
- return wxWindow::NextControlId(id);
- }
- int wxWindow_PrevControlId(int id) {
- return wxWindow::PrevControlId(id);
- }
-%}
-
//---------------------------------------------------------------------------
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const char* name = "panel");
+ %name(wxPrePanel)wxPanel();
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+ bool Create(wxWindow* parent,
+ const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTAB_TRAVERSAL,
+ const char* name = "panel");
+
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
void InitDialog();
- wxButton* GetDefaultItem();
- void SetDefaultItem(wxButton *btn);
- // fix some SWIG trouble...
- %pragma(python) addtoclass = "
- def GetDefaultItem(self):
- import controls
- val = windowsc.wxPanel_GetDefaultItem(self.this)
- val = controls.wxButtonPtr(val)
- return val
-"
};
//---------------------------------------------------------------------------
-class wxDialog : public wxPanel {
-public:
- wxDialog(wxWindow* parent,
- const wxWindowID id,
- const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_DIALOG_STYLE,
- const char* name = "dialogBox");
-
- %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
- void Centre(int direction = wxBOTH);
- void EndModal(int retCode);
- wxString GetTitle();
- void Iconize(bool iconize);
- bool IsIconized();
- void SetModal(bool flag);
- bool IsModal();
- void SetTitle(const wxString& title);
- bool Show(bool show);
- int ShowModal();
-
- int GetReturnCode();
- void SetReturnCode(int retCode);
- wxSizer* CreateTextSizer( const wxString &message );
- wxSizer* CreateButtonSizer( long flags );
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+// derive from it and wxPanel.
- %pragma(python) addtoclass = "
- # replace swig generated shadow methods to resolve import issues
- def CreateTextSizer(self, *_args, **_kwargs):
- import sizers
- val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
- if val: val = sizers.wxSizerPtr(val)
- return val
- def CreateButtonSizer(self, *_args, **_kwargs):
- import sizers
- val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
- if val: val = sizers.wxSizerPtr(val)
- return val
-"
-
-};
-
-//---------------------------------------------------------------------------
class wxScrolledWindow : public wxPanel {
public:
const wxSize& size = wxDefaultSize,
long style = wxHSCROLL | wxVSCROLL,
char* name = "scrolledWindow");
+ %name(wxPreScrolledWindow)wxScrolledWindow();
+
+ bool Create(wxWindow* parent,
+ const wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxHSCROLL | wxVSCROLL,
+ char* name = "scrolledWindow");
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
- %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(val)"
void EnableScrolling(bool xScrolling, bool yScrolling);
int GetScrollPageSize(int orient);
void SetScrollPageSize(int orient, int pageSize);
void SetTargetWindow(wxWindow* window);
void GetViewStart(int* OUTPUT, int* OUTPUT);
- void ViewStart(int* OUTPUT, int* OUTPUT);
+ %pragma(python) addtoclass = "ViewStart = GetViewStart"
void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+ void SetScale(double xs, double ys);
+ double GetScaleX();
+ double GetScaleY();
+
+ void AdjustScrollbars();
};
//----------------------------------------------------------------------
class wxMenu : public wxEvtHandler {
public:
- wxMenu(const wxString& title = wxPyEmptyStr, long style = 0);
+ wxMenu(const wxString& title = wxEmptyString, long style = 0);
+
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void Append(int id, const wxString& item,
- const wxString& helpString = wxPyEmptyStr,
+ const wxString& helpString = wxEmptyString,
int checkable = FALSE);
%name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
- const wxString& helpString = wxPyEmptyStr);
+ const wxString& helpString = wxEmptyString);
%name(AppendItem)void Append(const wxMenuItem* item);
void AppendSeparator();
public:
wxMenuBar(long style = 0);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
bool Append(wxMenu *menu, const wxString& title);
bool Insert(size_t pos, wxMenu *menu, const wxString& title);
size_t GetMenuCount();
void EnableTop(size_t pos, bool enable);
void SetLabelTop(size_t pos, const wxString& label);
wxString GetLabelTop(size_t pos);
+ int FindMenu(const wxString& title);
int FindMenuItem(const wxString& menuString, const wxString& itemString);
%name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);
void Enable(int id, bool enable);
//----------------------------------------------------------------------
-class wxMenuItem {
+class wxMenuItem : public wxObject {
public:
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
- const wxString& text = wxPyEmptyStr,
- const wxString& help = wxPyEmptyStr,
+ const wxString& text = wxEmptyString,
+ const wxString& help = wxEmptyString,
bool isCheckable = FALSE, wxMenu* subMenu = NULL);
// wxOwnerDrawn methods
#ifdef __WXMSW__
void SetFont(const wxFont& font);
- wxFont& GetFont();
+ wxFont GetFont();
void SetTextColour(const wxColour& colText);
- wxColour& GetTextColour();
+ wxColour GetTextColour();
void SetBackgroundColour(const wxColour& colBack);
- wxColour& GetBackgroundColour();
+ wxColour GetBackgroundColour();
void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap);
void SetBitmap(const wxBitmap& bmpChecked);
- const wxBitmap& GetBitmap(bool bChecked = TRUE);
+ wxBitmap GetBitmap(bool bChecked = TRUE);
void SetMarginWidth(int nWidth);
int GetMarginWidth();
static int GetDefaultMarginWidth();
projects / wxWidgets.git / blobdiff