X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10534c0bb1fe8716745ff51fea4bf42d4a6fa9f8..944930d5f525ffa2d10b7cefb1ecacaf1e95275c:/utils/wxPython/src/windows.i?ds=sidebyside diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index d4eb2844d4..34a42121c0 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -27,15 +27,26 @@ %import _defs.i %import misc.i %import gdi.i +%import clip_dnd.i %pragma(python) code = "import wx" - //--------------------------------------------------------------------------- class wxEvtHandler { public: bool ProcessEvent(wxEvent& event); + //bool SearchEventTable(wxEventTable& table, wxEvent& event); + + bool GetEvtHandlerEnabled(); + void SetEvtHandlerEnabled(bool enabled); + + wxEvtHandler* GetNextHandler(); + wxEvtHandler* GetPreviousHandler(); + void SetNextHandler(wxEvtHandler* handler); + void SetPreviousHandler(wxEvtHandler* handler); + + %addmethods { void Connect( int id, int lastId, int eventType, PyObject* func) { if (PyCallable_Check(func)) { @@ -48,6 +59,91 @@ public: }; +//---------------------------------------------------------------------- + +class wxValidator : public wxEvtHandler { +public: + wxValidator(); + //~wxValidator(); + + wxValidator* Clone(); + wxWindow* GetWindow(); + void SetWindow(wxWindow* window); +}; + +%inline %{ + bool wxValidator_IsSilent() { + return wxValidator::IsSilent(); + } + + void wxValidator_SetBellOnError(int doIt = TRUE) { + wxValidator::SetBellOnError(doIt); + } +%} + +//---------------------------------------------------------------------- +%{ +class wxPyValidator : public wxValidator { + DECLARE_DYNAMIC_CLASS(wxPyValidator); +public: + wxPyValidator() { + } +// wxPyValidator(const wxPyValidator& other); + + ~wxPyValidator() { + } + + wxObject* wxPyValidator::Clone() const { + wxPyValidator* ptr = NULL; + wxPyValidator* self = (wxPyValidator*)this; + + bool doSave = wxPyRestoreThread(); + if (self->m_myInst.findCallback("Clone")) { + PyObject* ro; + ro = self->m_myInst.callCallbackObj(Py_BuildValue("()")); + SWIG_GetPtrObj(ro, (void **)&ptr, "_wxPyValidator_p"); + } + // 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); +IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferToWindow); +IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferFromWindow); + +IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator); + +%} + +class wxPyValidator : public wxValidator { +public: + wxPyValidator(); +// ~wxPyValidator(); + + %addmethods { + void Destroy() { delete self; } + } + + void _setSelf(PyObject* self, int incref=TRUE); + %pragma(python) addtomethod = "__init__:self._setSelf(self, 0)" + +}; + //---------------------------------------------------------------------- %apply int * INOUT { int* x, int* y }; @@ -94,7 +190,6 @@ public: } } - int GetCharHeight(); int GetCharWidth(); %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT); @@ -105,6 +200,11 @@ public: wxFont& GetFont(); wxColour GetForegroundColour(); wxWindow * GetGrandParent(); + %addmethods { + long GetHandle() { + return (long)self->GetHandle(); + } + } int GetId(); wxString GetLabel(); void SetLabel(const wxString& label); @@ -156,9 +256,12 @@ public: 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); void SetConstraints(wxLayoutConstraints *constraints); + void UnsetConstraints(wxLayoutConstraints *constraints); void SetFocus(); + bool AcceptsFocus(); void SetFont(const wxFont& font); void SetForegroundColour(const wxColour& colour); void SetId(int id); @@ -202,6 +305,14 @@ public: %name(SetToolTipString)void SetToolTip(const wxString &tip); void SetToolTip(wxToolTip *tooltip); wxToolTip* GetToolTip(); + + void SetSizer(wxSizer* sizer); + wxValidator* GetValidator(); + void SetValidator(const wxValidator& validator); + + void SetDropTarget(wxDropTarget* target); + wxDropTarget* GetDropTarget(); + %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0" }; //%clear int* x, int* y; @@ -322,6 +433,10 @@ public: int noUnitsX, int noUnitsY, int xPos = 0, int yPos = 0); void ViewStart(int* OUTPUT, int* OUTPUT); + + void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT); + void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT); + }; //---------------------------------------------------------------------- @@ -341,61 +456,89 @@ public: void AppendSeparator(); void Break(); void Check(int id, bool flag); + bool IsChecked(int id); void Enable(int id, bool enable); + bool IsEnabled(int id); + int FindItem(const wxString& itemString); + %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/); + wxString GetTitle(); void SetTitle(const wxString& title); - wxMenuItem* FindItemForId(int id); - wxString GetHelpString(int id); + wxString GetLabel(int id); - void SetHelpString(int id, const wxString& helpString); - bool IsChecked(int id); - bool IsEnabled(int id); void SetLabel(int id, const wxString& label); + + wxString GetHelpString(int id); + void SetHelpString(int id, const wxString& helpString); void UpdateUI(wxEvtHandler* source = NULL); + bool Delete(int id); + %name(DeleteItem)bool Delete(wxMenuItem *item); + bool Insert(size_t pos, wxMenuItem *item); + wxMenuItem *Remove(int id); + %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item); + %addmethods { void Destroy() { delete self; } } + %name(DestroyId)bool Destroy(int id); + %name(DestroyItem)bool Destroy(wxMenuItem *item); -}; + size_t GetMenuItemCount(); + //wxMenuItemList& GetMenuItems(); + %addmethods { + PyObject* GetMenuItems() { + wxMenuItemList& list = self->GetMenuItems(); + return wxPy_ConvertList(&list, "wxMenuItem"); + } + } + void SetEventHandler(wxEvtHandler *handler); + wxEvtHandler *GetEventHandler(); + + void SetInvokingWindow(wxWindow *win); + wxWindow *GetInvokingWindow(); + + long GetStyle(); + + bool IsAttached(); + + void SetParent(wxMenu *parent); + wxMenu *GetParent(); +}; -// -// This one knows how to set a callback and handle INC- and DECREFing it. To -// be used for PopupMenus, but you must retain a referece to it while using -// it. -// -// class wxPyMenu : public wxMenu { -// public: -// wxPyMenu(const wxString& title = wxPyEmptyStr, PyObject* func = NULL); -// ~wxPyMenu(); -// }; //---------------------------------------------------------------------- -class wxMenuBar : public wxEvtHandler { +class wxMenuBar : public wxWindow { public: wxMenuBar(); - void Append(wxMenu *menu, const wxString& title); - void Check(int id, bool flag); - bool Checked(int id); - void Enable(int id, bool enable); - bool Enabled(int id); + bool Append(wxMenu *menu, const wxString& title); + bool Insert(size_t pos, wxMenu *menu, const wxString& title); + size_t GetMenuCount(); + wxMenu *GetMenu(size_t pos); + wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); + wxMenu *Remove(size_t pos); + void EnableTop(size_t pos, bool enable); + void SetLabelTop(size_t pos, const wxString& label); + wxString GetLabelTop(size_t pos); int FindMenuItem(const wxString& menuString, const wxString& itemString); - wxMenuItem * FindItemForId(int id); - void SetLabel(int id, const wxString& label); - void EnableTop(int pos, bool enable); - wxString GetHelpString(int id); + %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/); + void Enable(int id, bool enable); + void Check(int id, bool check); + bool IsChecked(int id); + bool IsEnabled(int id); + + void SetLabel(int id, const wxString &label); wxString GetLabel(int id); + void SetHelpString(int id, const wxString& helpString); - wxString GetLabelTop(int pos); - void SetLabelTop(int pos, const wxString& label); - int GetMenuCount(); - wxMenu* GetMenu(int i); + wxString GetHelpString(int id); + }; @@ -403,41 +546,51 @@ public: class wxMenuItem { public: -#ifndef __WXGTK__ wxMenuItem(wxMenu* parentMenu=NULL, int id=ID_SEPARATOR, const wxString& text = wxPyEmptyStr, - const wxString& helpString = wxPyEmptyStr, - bool checkable = FALSE, wxMenu* subMenu = NULL); -#else - wxMenuItem(); -#endif + const wxString& help = wxPyEmptyStr, + bool isCheckable = FALSE, wxMenu* subMenu = NULL); + + wxMenu *GetMenu(); + void SetId(int id); + int GetId(); bool IsSeparator(); + void SetText(const wxString& str); + wxString GetLabel(); + const wxString& GetText(); + void SetCheckable(bool checkable); + bool IsCheckable(); + bool IsSubMenu(); + void SetSubMenu(wxMenu *menu); + wxMenu *GetSubMenu(); + void Enable(bool enable = TRUE); bool IsEnabled(); + void Check(bool check = TRUE); bool IsChecked(); - bool IsCheckable(); - int GetId(); - wxMenu* GetSubMenu(); - void SetName(const wxString& strName); - wxString GetName(); - wxString GetHelp(); - void SetHelp(const wxString& strHelp); - void Enable(bool bDoEnable = TRUE); - void Check(bool bDoCheck = TRUE); - -#ifdef __WXMSW__ - wxColour& GetBackgroundColour(); - wxBitmap GetBitmap(bool checked = TRUE); - wxFont& GetFont(); - int GetMarginWidth(); - wxColour& GetTextColour(); - void SetBackgroundColour(const wxColour& colour); - void SetBitmaps(const wxBitmap& checked, const wxBitmap& unchecked = wxNullBitmap); - void SetFont(const wxFont& font); - void SetMarginWidth(int width); - void SetTextColour(const wxColour& colour); - void DeleteSubMenu(); -#endif + void Toggle(); + void SetHelp(const wxString& str); + const wxString& GetHelp(); + wxAcceleratorEntry *GetAccel(); + void SetAccel(wxAcceleratorEntry *accel); + +// #ifdef __WXMSW__ +// wxColour& GetBackgroundColour(); +// wxBitmap GetBitmap(bool checked = TRUE); +// wxFont& GetFont(); +// int GetMarginWidth(); +// wxColour& GetTextColour(); +// void SetBackgroundColour(const wxColour& colour); +// void SetBitmaps(const wxBitmap& checked, const wxBitmap& unchecked = wxNullBitmap); +// void SetFont(const wxFont& font); +// void SetMarginWidth(int width); +// void SetText(const wxString& str); +// const wxString& GetText(); +// void SetTextColour(const wxColour& colour); +// void DeleteSubMenu(); +// void SetCheckable(bool checkable); +// void SetSubMenu(wxMenu *menu); +// #endif }; //---------------------------------------------------------------------------