Added missing files to filelist.txt and regenerated makefiles.

[wxWidgets.git] / utils / wxPython / src / windows.i

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 1d5140a1fffc0560724fb13f9870b070acc98dfc..1bb931f5187d8a0b3bd76735f2ad2793dadd12c4 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -29,11 +29,14 @@
 %import gdi.i
 
 %pragma(python) code = "import wx"
 %import gdi.i
 
 %pragma(python) code = "import wx"

+//%pragma(python) code = "import controls"
+//%pragma(python) code = "wxButtonPtr = controls.wxWindowPtr"

 
 //---------------------------------------------------------------------------
 
 class wxEvtHandler {
 public:
 
 //---------------------------------------------------------------------------
 
 class wxEvtHandler {
 public:

+    bool ProcessEvent(wxEvent& event);

     %addmethods {
         void Connect( int id, int lastId, int eventType, PyObject* func) {
             if (PyCallable_Check(func)) {
     %addmethods {
         void Connect( int id, int lastId, int eventType, PyObject* func) {
             if (PyCallable_Check(func)) {


@@ -61,9 +64,12 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void CaptureMouse();
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void CaptureMouse();

-    void Center(int direction = wxHORIZONTAL);
-    void Centre(int direction = wxHORIZONTAL);
-    void ClientToScreen(int *BOTH, int *BOTH);
+    void Center(int direction = wxBOTH);
+    void Centre(int direction = wxBOTH);
+    void CentreOnParent(int direction = wxBOTH );
+    void CenterOnParent(int direction = wxBOTH );
+    %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);
+    wxPoint ClientToScreen(const wxPoint& pt);

     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();


@@ -72,7 +78,7 @@ public:
 #endif
     void Enable(bool enable);
     //bool FakePopupMenu(wxMenu* menu, int x, int y);
 #endif
     void Enable(bool enable);
     //bool FakePopupMenu(wxMenu* menu, int x, int y);

-    %name(FindWindowByID) wxWindow* FindWindow(long id);
+    %name(FindWindowById) wxWindow* FindWindow(long id);

     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
     void Fit();
     wxColour GetBackgroundColour();
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
     void Fit();
     wxColour GetBackgroundColour();


@@ -81,9 +87,6 @@ public:
     %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
     wxSize GetClientSize();
     wxLayoutConstraints * GetConstraints();
     %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
     wxSize GetClientSize();
     wxLayoutConstraints * GetConstraints();

-#ifdef __WXMSW__
-    wxButton* GetDefaultItem();
-#endif

     //wxEvtHandler* GetEventHandler();
 
     wxFont& GetFont();
     //wxEvtHandler* GetEventHandler();
 
     wxFont& GetFont();


@@ -91,56 +94,64 @@ public:
     wxWindow * GetGrandParent();
     int GetId();
     wxString GetLabel();
     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();
     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);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
     wxSize GetSize();
     int GetScrollThumb(int orientation);
     int GetScrollPos(int orientation);
     int GetScrollRange(int orientation);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
     wxSize GetSize();

-    void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE)
+    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();
     wxString GetTitle();

+    wxRegion GetUpdateRegion();

     long GetWindowStyleFlag();
     long GetWindowStyleFlag();

+    bool Hide();

     void InitDialog();
     bool IsEnabled();
     bool IsRetained();
     bool IsShown();
     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();
     void MakeModal(bool flag);
     void Layout();
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
     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);
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);

-    bool PopupMenu(wxMenu *menu, int x, int y);

     //void PushEventHandler(wxEvtHandler* handler);
 
     //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();
     void Raise();
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();

-    void ScreenToClient(int *BOTH, int *BOTH);
+    bool Reparent( wxWindow* newParent );
+
+    %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);
+    wxPoint ScreenToClient(const wxPoint& pt);
+

     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 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 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);
 
     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) {
     %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
     %addmethods {
         void SetSize(const wxSize& size) {


@@ -153,7 +164,8 @@ public:
     }
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     }
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);

-    void SetClientSize(int width, int height);
+    %name(SetClientSizeWH)void SetClientSize(int width, int height);
+    void SetClientSize(const wxSize& size);

     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);


@@ -167,26 +179,47 @@ public:
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
 
     %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(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 = "
 };
 
 %pragma(python) code = "

-def wxDLG_PNT(win, point):
-    return win.ConvertDialogPointToPixels(point)
-
-def wxDLG_SZE(win, size):
-    return win.ConvertDialogPointToPixels(size)
+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))

 "
 
 "
 

-// Static method(s)

 #ifdef __WXMSW__
 %inline %{
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
 %}
 #ifdef __WXMSW__
 %inline %{
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
 %}

+
+
+%inline %{
+wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
+    wxWindow* win = new wxWindow;
+    win->SetHWND(hWnd);
+    win->SubclassWin(hWnd);
+    return win;
+}
+%}

 #endif
 
 
 #endif
 
 


@@ -204,6 +237,17 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void InitDialog();
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void InitDialog();

+    wxButton* GetDefaultItem();
+    void SetDefaultItem(wxButton *btn);
+
+    // fix a SWIG turd...
+    %pragma(python) addtoclass = "
+    def GetDefaultItem(self):
+        import controls
+        val = windowsc.wxPanel_GetDefaultItem(self.this)
+        val = controls.wxButtonPtr(val)
+        return val
+"

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -230,11 +274,14 @@ public:
     void SetTitle(const wxString& title);
     bool Show(bool show);
     int ShowModal();
     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,
 public:
     wxScrolledWindow(wxWindow* parent,
                      const wxWindowID id = -1,


@@ -263,13 +310,17 @@ public:
 
 class wxMenu : public wxEvtHandler {
 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);
 
     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();
     void Check(int id, bool flag);
     void AppendSeparator();
     void Break();
     void Check(int id, bool flag);


@@ -284,6 +335,7 @@ public:
     bool IsChecked(int id);
     bool IsEnabled(int id);
     void SetLabel(int id, const wxString& label);
     bool IsChecked(int id);
     bool IsEnabled(int id);
     void SetLabel(int id, const wxString& label);

+    void UpdateUI(wxEvtHandler* source = NULL);

 };
 
 
 };
 
 


@@ -292,11 +344,11 @@ public:
 // be used for PopupMenus, but you must retain a referece to it while using
 // it.
 //
 // 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();
+//  };

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -310,8 +362,8 @@ public:
     void Enable(int id, bool enable);
     bool Enabled(int id);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);
     void Enable(int id, bool enable);
     bool Enabled(int id);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);

-#ifdef __WXMSW__

     wxMenuItem * FindItemForId(int id);
     wxMenuItem * FindItemForId(int id);

+#ifdef __WXMSW__

     void EnableTop(int pos, bool enable);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);
     void EnableTop(int pos, bool enable);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);


@@ -329,6 +381,15 @@ public:
 
 class wxMenuItem {
 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 IsSeparator();
     bool IsEnabled();
     bool IsChecked();


@@ -336,13 +397,23 @@ public:
     int  GetId();
     wxMenu* GetSubMenu();
     void SetName(const wxString& strName);
     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__
     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 DeleteSubMenu();
 #endif
 };


@@ -351,7 +422,108 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.18  1999/07/31 07:54:35  RD
+// wxPython 2.1b1:
+//
+//     Added the missing wxWindow.GetUpdateRegion() method.
+//
+//     Made a new change in SWIG (update your patches everybody) that
+//     provides a fix for global shadow objects that get an exception in
+//     their __del__ when their extension module has already been deleted.
+//     It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+//     line 496 if you want to do it by hand.
+//
+//     It is now possible to run through MainLoop more than once in any one
+//     process.  The cleanup that used to happen as MainLoop completed (and
+//     prevented it from running again) has been delayed until the wxc module
+//     is being unloaded by Python.
+//
+//     wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+//     wxWindow.PopupMenuXY to be consistent with some other methods.
+//
+//     Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+//
+//     You can now provide your own app.MainLoop method.  See
+//     wxPython/demo/demoMainLoop.py for an example and some explaination.
+//
+//     Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+//     code to show how to use it.
+//
+//     Put the wxIcon constructor back in for GTK as it now has one that
+//     matches MSW's.
+//
+//     Added wxGrid.GetCells
+//
+//     Added wxSystemSettings static methods as functions with names like
+//     wxSystemSettings_GetSystemColour.
+//
+//     Removed wxPyMenu since using menu callbacks have been depreciated in
+//     wxWindows.  Use wxMenu and events instead.
+//
+//     Added alternate wxBitmap constructor (for MSW only) as
+//           wxBitmapFromData(data, type, width, height, depth = 1)
+//
+//     Added a helper function named wxPyTypeCast that can convert shadow
+//     objects of one type into shadow objects of another type.  (Like doing
+//     a down-cast.)  See the implementation in wx.py for some docs.
+//
+// Revision 1.17  1999/06/22 07:03:03  RD
+//
+// wxPython 2.1b1 for wxMSW  (wxGTK coming soon)
+// Lots of changes, see the README.txt for details...
+//
+// Revision 1.16  1999/05/15 00:56:04  RD
+//
+// fixes for GetReturnCode/SetReturnCode
+//
+// 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
 // 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!
 // wxPython 0.5.2
 // Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
 // versions are much closer now!