X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afc48cd0d89304435b18a2fb610a66e3ff278666..9cce9de16f93d260e9089bda724e9cf2e3b36b26:/utils/wxPython/src/windows.i diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index 8243a53ec4..d4eb2844d4 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -30,10 +30,12 @@ %pragma(python) code = "import wx" + //--------------------------------------------------------------------------- class wxEvtHandler { public: + bool ProcessEvent(wxEvent& event); %addmethods { void Connect( int id, int lastId, int eventType, PyObject* func) { if (PyCallable_Check(func)) { @@ -48,6 +50,7 @@ public: //---------------------------------------------------------------------- +%apply int * INOUT { int* x, int* y }; class wxWindow : public wxEvtHandler { public: @@ -61,12 +64,15 @@ public: %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void CaptureMouse(); - void Center(int direction = wxHORIZONTAL); - void Centre(int direction = wxHORIZONTAL); - %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH); -#ifndef __WXGTK__ + void Center(int direction = wxBOTH); + void Centre(int direction = wxBOTH); + void CentreOnParent(int direction = wxBOTH ); + void CenterOnParent(int direction = wxBOTH ); + + // (uses apply'ed INOUT typemap, see above) + %name(ClientToScreenXY)void ClientToScreen(int* x, int* y); wxPoint ClientToScreen(const wxPoint& pt); -#endif + bool Close(int force = FALSE); bool Destroy(); void DestroyChildren(); @@ -79,27 +85,34 @@ public: %name(FindWindowByName) wxWindow* FindWindow(const wxString& name); void Fit(); wxColour GetBackgroundColour(); + + //wxList& GetChildren(); + %addmethods { + PyObject* GetChildren() { + wxWindowList& list = self->GetChildren(); + return wxPy_ConvertList(&list, "wxWindow"); + } + } + + int GetCharHeight(); int GetCharWidth(); %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT); wxSize GetClientSize(); wxLayoutConstraints * GetConstraints(); -#ifdef __WXMSW__ - wxButton* GetDefaultItem(); -#endif - //wxEvtHandler* GetEventHandler(); + wxEvtHandler* GetEventHandler(); wxFont& GetFont(); wxColour GetForegroundColour(); wxWindow * GetGrandParent(); int GetId(); wxString GetLabel(); + void SetLabel(const wxString& label); wxString GetName(); wxWindow * GetParent(); %name(GetPositionTuple) void GetPosition(int *OUTPUT, int *OUTPUT); wxPoint GetPosition(); wxRect GetRect(); - int GetReturnCode(); int GetScrollThumb(int orientation); int GetScrollPos(int orientation); int GetScrollRange(int orientation); @@ -110,11 +123,14 @@ public: int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT, const wxFont* font = NULL); //, bool use16 = FALSE) wxString GetTitle(); + wxRegion GetUpdateRegion(); long GetWindowStyleFlag(); + bool Hide(); void InitDialog(); bool IsEnabled(); bool IsRetained(); bool IsShown(); + bool IsTopLevel(); void Layout(); bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL); void Lower(); @@ -122,30 +138,31 @@ public: %name(MoveXY)void Move(int x, int y); void Move(const wxPoint& point); - //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE); - bool PopupMenu(wxMenu *menu, int x, int y); - //void PushEventHandler(wxEvtHandler* handler); + wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE); + void PushEventHandler(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 ReleaseMouse(); - %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH); -#ifndef __WXGTK__ + bool Reparent( wxWindow* newParent ); + + // (uses apply'ed INOUT typemap, see above) + %name(ScreenToClientXY)void ScreenToClient(int *x, int *y); wxPoint ScreenToClient(const wxPoint& pt); -#endif void ScrollWindow(int dx, int dy, const wxRect* rect = NULL); void SetAcceleratorTable(const wxAcceleratorTable& accel); void SetAutoLayout(bool autoLayout); void SetBackgroundColour(const wxColour& colour); void SetConstraints(wxLayoutConstraints *constraints); - void SetDoubleClick(bool allowDoubleClick); void SetFocus(); void SetFont(const wxFont& font); void SetForegroundColour(const wxColour& colour); void SetId(int id); void SetName(const wxString& name); - void SetReturnCode(int retCode); void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE); void SetScrollPos(int orientation, int pos, bool refresh = TRUE); @@ -165,7 +182,7 @@ public: void SetClientSize(const wxSize& size); //void SetPalette(wxPalette* palette); void SetCursor(const wxCursor&cursor); - //void SetEventHandler(wxEvtHandler* handler); + void SetEventHandler(wxEvtHandler* handler); void SetTitle(const wxString& title); bool Show(bool show); bool TransferDataFromWindow(); @@ -176,6 +193,9 @@ public: %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt); %name(ConvertDialogSizeToPixels) wxSize ConvertDialogToPixels(const wxSize& sz); + %name(DLG_PNT) wxPoint ConvertDialogToPixels(const wxPoint& pt); + %name(DLG_SZE) wxSize ConvertDialogToPixels(const wxSize& sz); + %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt); %name(ConvertPixelSizeToDialog) wxSize ConvertPixelsToDialog(const wxSize& sz); @@ -184,12 +204,22 @@ public: wxToolTip* GetToolTip(); }; -%pragma(python) code = " -def wxDLG_PNT(win, point): - return win.ConvertDialogPointToPixels(point) +//%clear int* x, int* y; + + -def wxDLG_SZE(win, size): - return win.ConvertDialogSizeToPixels(size) +%pragma(python) code = " +def wxDLG_PNT(win, point_or_x, y=None): + if y is None: + return win.ConvertDialogPointToPixels(point_or_x) + else: + return win.ConvertDialogPointToPixels(wxPoint(point_or_x, y)) + +def wxDLG_SZE(win, size_width, height=None): + if height is None: + return win.ConvertDialogSizeToPixels(size_width) + else: + return win.ConvertDialogSizeToPixels(wxSize(size_width, height)) " #ifdef __WXMSW__ @@ -211,6 +241,7 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) { #endif + //--------------------------------------------------------------------------- class wxPanel : public wxWindow { @@ -225,6 +256,17 @@ public: %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" 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 +" }; //--------------------------------------------------------------------------- @@ -251,11 +293,14 @@ public: void SetTitle(const wxString& title); bool Show(bool show); int ShowModal(); + + int GetReturnCode(); + void SetReturnCode(int retCode); }; //--------------------------------------------------------------------------- -class wxScrolledWindow : public wxWindow { +class wxScrolledWindow : public wxPanel { public: wxScrolledWindow(wxWindow* parent, const wxWindowID id = -1, @@ -284,16 +329,14 @@ public: class wxMenu : public wxEvtHandler { public: - wxMenu(const wxString& title = wxPyEmptyStr); + wxMenu(const wxString& title = wxPyEmptyStr, long style = 0); void Append(int id, const wxString& item, const wxString& helpString = wxPyEmptyStr, int checkable = FALSE); %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = wxPyEmptyStr); -#ifndef __WXGTK__ %name(AppendItem)void Append(const wxMenuItem* item); -#endif void AppendSeparator(); void Break(); @@ -309,6 +352,14 @@ public: bool IsChecked(int id); bool IsEnabled(int id); void SetLabel(int id, const wxString& label); + void UpdateUI(wxEvtHandler* source = NULL); + + %addmethods { + void Destroy() { + delete self; + } + } + }; @@ -317,11 +368,11 @@ public: // 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 wxPyMenu : public wxMenu { +// public: +// wxPyMenu(const wxString& title = wxPyEmptyStr, PyObject* func = NULL); +// ~wxPyMenu(); +// }; //---------------------------------------------------------------------- @@ -336,15 +387,13 @@ public: bool Enabled(int id); int FindMenuItem(const wxString& menuString, const wxString& itemString); wxMenuItem * FindItemForId(int id); -#ifdef __WXMSW__ + void SetLabel(int id, const wxString& label); void EnableTop(int pos, bool enable); wxString GetHelpString(int id); wxString GetLabel(int id); void SetHelpString(int id, const wxString& helpString); - void SetLabel(int id, const wxString& label); wxString GetLabelTop(int pos); void SetLabelTop(int pos, const wxString& label); -#endif int GetMenuCount(); wxMenu* GetMenu(int i); }; @@ -354,6 +403,15 @@ 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 + bool IsSeparator(); bool IsEnabled(); bool IsChecked(); @@ -361,102 +419,27 @@ public: int GetId(); wxMenu* GetSubMenu(); void SetName(const wxString& strName); - const wxString& GetName(); - const wxString& GetHelp(); + 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 }; //--------------------------------------------------------------------------- -///////////////////////////////////////////////////////////////////////////// -// -// $Log$ -// Revision 1.14 1999/02/23 23:48:33 RD -// reenabled some methods for wxPython on wxGTK -// -// Revision 1.13 1999/02/20 10:02:38 RD -// -// Changes needed to enable wxGTK compatibility. -// -// Revision 1.12 1999/02/20 09:03:03 RD -// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a -// window handle. If you can get the window handle into the python code, -// it should just work... More news on this later. -// -// Added wxImageList, wxToolTip. -// -// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the -// wxRegConfig class. -// -// As usual, some bug fixes, tweaks, etc. -// -// Revision 1.11 1998/12/18 15:49:10 RR -// -// wxClipboard now serves the primary selection as well -// wxPython fixes -// warning mesages -// -// Revision 1.10 1998/12/17 17:52:20 RD -// -// wxPython 0.5.2 -// Minor fixes and SWIG code generation for RR's changes. MSW and GTK -// versions are much closer now! -// -// Revision 1.9 1998/12/17 14:07:46 RR -// -// Removed minor differences between wxMSW and wxGTK -// -// Revision 1.8 1998/12/16 22:10:56 RD -// -// Tweaks needed to be able to build wxPython with wxGTK. -// -// Revision 1.7 1998/12/15 20:41:25 RD -// Changed the import semantics from "from wxPython import *" to "from -// wxPython.wx import *" This is for people who are worried about -// namespace pollution, they can use "from wxPython import wx" and then -// prefix all the wxPython identifiers with "wx." -// -// Added wxTaskbarIcon for wxMSW. -// -// Made the events work for wxGrid. -// -// Added wxConfig. -// -// Added wxMiniFrame for wxGTK, (untested.) -// -// Changed many of the args and return values that were pointers to gdi -// objects to references to reflect changes in the wxWindows API. -// -// Other assorted fixes and additions. -// -// Revision 1.6 1998/10/02 06:40:43 RD -// -// Version 0.4 of wxPython for MSW. -// -// Revision 1.5 1998/08/17 18:29:40 RD -// Removed an extra method definition -// -// Revision 1.4 1998/08/16 04:31:11 RD -// More wxGTK work. -// -// Revision 1.3 1998/08/15 07:36:47 RD -// - Moved the header in the .i files out of the code that gets put into -// the .cpp files. It caused CVS conflicts because of the RCS ID being -// different each time. -// -// - A few minor fixes. -// -// Revision 1.2 1998/08/14 23:36:46 RD -// Beginings of wxGTK compatibility -// -// Revision 1.1 1998/08/09 08:25:52 RD -// Initial version -// -//