X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853b255a6b035f9448b4ca7e07a453be7bd2f892..d9f39e09e82e99c422619f4e3df536d0a9e87987:/utils/wxPython/src/windows.i?ds=sidebyside diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index 592bdeb551..99fc69c14d 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -1,5 +1,3 @@ -%module windows -%{ ///////////////////////////////////////////////////////////////////////////// // Name: windows.i // Purpose: SWIG definitions of various window classes @@ -13,16 +11,11 @@ ///////////////////////////////////////////////////////////////////////////// -#include "helpers.h" +%module windows -#ifdef __WXMSW__ - // wxGTK defines wxMenuItem inside menu.h +%{ +#include "helpers.h" #include -#endif - -#ifdef __WXMSW__ -#include -#endif %} //---------------------------------------------------------------------- @@ -35,11 +28,13 @@ %import misc.i %import gdi.i +%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)) { @@ -64,11 +59,15 @@ public: long style = 0, char* name = "panel"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void CaptureMouse(); - //void Center(int direction = wxHORIZONTAL); + void Center(int direction = wxHORIZONTAL); void Centre(int direction = wxHORIZONTAL); - void ClientToScreen(int *BOTH, int *BOTH); + %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH); +#ifndef __WXGTK__ + wxPoint ClientToScreen(const wxPoint& pt); +#endif bool Close(int force = FALSE); bool Destroy(); void DestroyChildren(); @@ -77,58 +76,52 @@ public: #endif void Enable(bool enable); //bool FakePopupMenu(wxMenu* menu, int x, int y); + %name(FindWindowById) wxWindow* FindWindow(long id); + %name(FindWindowByName) wxWindow* FindWindow(const wxString& name); void Fit(); wxColour GetBackgroundColour(); -#ifdef __WXMSW__ int GetCharHeight(); int GetCharWidth(); -#endif - void GetClientSize(int *OUTPUT, int *OUTPUT); + %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT); + wxSize GetClientSize(); wxLayoutConstraints * GetConstraints(); #ifdef __WXMSW__ wxButton* GetDefaultItem(); #endif //wxEvtHandler* GetEventHandler(); - wxFont* GetFont(); -#ifdef __WXMSW__ + + wxFont& GetFont(); wxColour GetForegroundColour(); wxWindow * GetGrandParent(); -#endif int GetId(); - void GetPosition(int *OUTPUT, int *OUTPUT); -#ifdef __WXMSW__ - wxString& GetLabel(); - wxString& GetName(); -#else wxString GetLabel(); wxString GetName(); -#endif 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); - void GetSize(int *OUTPUT, int *OUTPUT); -#ifdef __WXMSW__ - void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE) -#endif -#ifdef __WXMSW__ - wxString& GetTitle(); -#else + %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT); + wxSize GetSize(); + void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); + %name(GetFullTextExtent)void GetTextExtent(const wxString& string, + int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT, + const wxFont* font = NULL); //, bool use16 = FALSE) wxString GetTitle(); -#endif long GetWindowStyleFlag(); void InitDialog(); bool IsEnabled(); bool IsRetained(); bool IsShown(); void Layout(); -#ifdef __WXMSW__ bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL); -#endif void Lower(); void MakeModal(bool flag); - void Move(int x, int y); + %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); @@ -137,26 +130,26 @@ public: void Raise(); void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL); void ReleaseMouse(); - void ScreenToClient(int *BOTH, int *BOTH); + %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH); +#ifndef __WXGTK__ + 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); -#ifdef __WXMSW__ void SetForegroundColour(const wxColour& colour); -#endif 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); - //void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO); - //%name(SetSizeOnly) void SetSize(int width, int height); - %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO); %addmethods { void SetSize(const wxSize& size) { @@ -168,12 +161,10 @@ public: } } -#ifdef __WXMSW__ void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1); -#endif - void SetClientSize(int width, int height); + %name(SetClientSizeWH)void SetClientSize(int width, int height); + void SetClientSize(const wxSize& size); //void SetPalette(wxPalette* palette); - //void SetColourMap(wxColourMap *colourMap); void SetCursor(const wxCursor&cursor); //void SetEventHandler(wxEvtHandler* handler); void SetTitle(const wxString& title); @@ -181,70 +172,48 @@ public: bool TransferDataFromWindow(); bool TransferDataToWindow(); bool Validate(); -#ifdef __WXMSW__ void WarpPointer(int x, int y); -#endif + %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); + + %name(SetToolTipString)void SetToolTip(const wxString &tip); + void SetToolTip(wxToolTip *tooltip); + wxToolTip* GetToolTip(); }; +%pragma(python) code = " +def wxDLG_PNT(win, point): + return win.ConvertDialogPointToPixels(point) + +def wxDLG_SZE(win, size): + return win.ConvertDialogSizeToPixels(size) +" -// Static method(s) #ifdef __WXMSW__ %inline %{ wxWindow* wxWindow_FindFocus() { return wxWindow::FindFocus(); } %} -#endif -//---------------------------------------------------------------------- -class wxFrame : public wxWindow { -public: - wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); - - void Centre(int direction = wxBOTH); -#ifdef __WXMSW__ - void Command(int id); -#endif - bool CreateStatusBar(int number = 1); - wxMenuBar* GetMenuBar(); - wxStatusBar* GetStatusBar(); -#ifdef __WXMSW__ - wxString& GetTitle(); -#else - wxString GetTitle(); -#endif -#ifdef __WXMSW__ - void Iconize(bool iconize); - bool IsIconized(); - void SetAcceleratorTable(const wxAcceleratorTable& accel); - void Maximize(bool maximize); +%inline %{ +wxWindow* wxWindow_FromHWND(unsigned long hWnd) { + wxWindow* win = new wxWindow; + win->SetHWND(hWnd); + win->SubclassWin(hWnd); + return win; +} +%} #endif - void SetIcon(const wxIcon& icon); - void SetMenuBar(wxMenuBar* menuBar); - void SetStatusText(const wxString& text, int number = 0); - void SetStatusWidths(int LCOUNT, int* LIST); // use typemap - void SetTitle(const wxString& title); - -}; -//--------------------------------------------------------------------------- - -#ifdef __WXMSW__ -class wxMiniFrame : public wxFrame { -public: - wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); -}; -#endif //--------------------------------------------------------------------------- @@ -257,6 +226,8 @@ public: long style = wxTAB_TRAVERSAL, const char* name = "panel"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void InitDialog(); }; @@ -272,14 +243,14 @@ public: 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(); -#ifdef __WXMSW__ void Iconize(bool iconize); bool IsIconized(); void SetModal(bool flag); -#endif bool IsModal(); void SetTitle(const wxString& title); bool Show(bool show); @@ -297,6 +268,9 @@ public: long style = wxHSCROLL | wxVSCROLL, char* name = "scrolledWindow"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)" + void EnableScrolling(bool xScrolling, bool yScrolling); void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT); void GetVirtualSize(int* OUTPUT, int* OUTPUT); @@ -321,26 +295,27 @@ public: 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(); void Check(int id, bool flag); void Enable(int id, bool enable); int FindItem(const wxString& itemString); -#ifdef __WXMSW__ + wxString GetTitle(); + void SetTitle(const wxString& title); wxMenuItem* FindItemForId(int id); - wxString& GetHelpString(int id); + wxString GetHelpString(int id); wxString GetLabel(int id); - wxString GetTitle(); void SetHelpString(int id, const wxString& helpString); - void SetTitle(const wxString& title); -#endif bool IsChecked(int id); bool IsEnabled(int id); void SetLabel(int id, const wxString& label); }; -#ifdef __WXMSW__ // // 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 @@ -351,7 +326,6 @@ public: wxPyMenu(const wxString& title = wxPyEmptyStr, PyObject* func = NULL); ~wxPyMenu(); }; -#endif //---------------------------------------------------------------------- @@ -363,10 +337,11 @@ public: void Check(int id, bool flag); bool Checked(int id); void Enable(int id, bool enable); + bool Enabled(int id); int FindMenuItem(const wxString& menuString, const wxString& itemString); + wxMenuItem * FindItemForId(int id); #ifdef __WXMSW__ void EnableTop(int pos, bool enable); - wxMenuItem * FindItemForId(int id); wxString GetHelpString(int id); wxString GetLabel(int id); void SetHelpString(int id, const wxString& helpString); @@ -374,6 +349,8 @@ public: wxString GetLabelTop(int pos); void SetLabelTop(int pos, const wxString& label); #endif + int GetMenuCount(); + wxMenu* GetMenu(int i); }; @@ -381,29 +358,142 @@ 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(); + bool IsCheckable(); int GetId(); wxMenu* GetSubMenu(); -#ifdef __WXMSW__ - const wxString& GetHelp(); void SetName(const wxString& strName); + wxString GetName(); + wxString GetHelp(); void SetHelp(const wxString& strHelp); -#endif 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(); - const wxString& GetName(); #endif - bool IsCheckable(); }; //--------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.15 1999/04/30 03:29:19 RD +// wxPython 2.0b9, first phase (win32) +// Added gobs of stuff, see wxPython/README.txt for details +// +// Revision 1.14.4.3 1999/03/27 23:29:15 RD +// +// wxPython 2.0b8 +// Python thread support +// various minor additions +// various minor fixes +// +// Revision 1.14.4.2 1999/03/16 06:26:29 RD +// +// wxPython 2.0b7 +// +// Revision 1.14.4.1 1999/03/16 06:04:04 RD +// +// wxPython 2.0b7 +// +// 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 //