minimal now works in Unicode mode

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

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 362e2b1dde8c5b964104fa567282b21e3ea69f72..8243a53ec47241f2499b8e730d0c771c962eea65 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -15,15 +15,7 @@
 
 %{
 #include "helpers.h"
 
 %{
 #include "helpers.h"

-
-#ifdef __WXMSW__
-    // wxGTK defines wxMenuItem inside menu.h

 #include <wx/menuitem.h>
 #include <wx/menuitem.h>

-#endif
-
-#ifdef __WXMSW__
-#include <wx/minifram.h>
-#endif

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -71,7 +63,10 @@ public:
     void CaptureMouse();
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);
     void CaptureMouse();
     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();
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();


@@ -80,7 +75,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();


@@ -93,6 +88,7 @@ public:
     wxButton* GetDefaultItem();
 #endif
     //wxEvtHandler* GetEventHandler();
     wxButton* GetDefaultItem();
 #endif
     //wxEvtHandler* GetEventHandler();

+

     wxFont& GetFont();
     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     wxFont& GetFont();
     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();


@@ -109,7 +105,10 @@ public:
     int GetScrollRange(int orientation);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
     wxSize GetSize();
     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();
     long GetWindowStyleFlag();
     void InitDialog();
     wxString GetTitle();
     long GetWindowStyleFlag();
     void InitDialog();


@@ -120,7 +119,8 @@ public:
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
     void Lower();
     void MakeModal(bool flag);
     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);
     bool PopupMenu(wxMenu *menu, int x, int y);
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);


@@ -129,7 +129,11 @@ public:
     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);
+    %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 ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     void SetAutoLayout(bool autoLayout);


@@ -145,9 +149,6 @@ public:
     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) {


@@ -160,7 +161,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);


@@ -169,9 +171,7 @@ public:
     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool Validate();
     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool Validate();

-#ifdef __WXMSW__

     void WarpPointer(int x, int y);
     void WarpPointer(int x, int y);

-#endif

 
     %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);


@@ -179,6 +179,9 @@ public:
     %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 = "


@@ -186,16 +189,25 @@ def wxDLG_PNT(win, point):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):

-    return win.ConvertDialogPointToPixels(size)
+    return win.ConvertDialogSizeToPixels(size)

 "
 
 "
 

-// 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
 
 


@@ -279,15 +291,17 @@ public:
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 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 Enable(int id, bool enable);
     int FindItem(const wxString& itemString);
     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);
     wxString GetTitle();
     void SetTitle(const wxString& title);

-#endif

     wxMenuItem* FindItemForId(int id);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);
     wxMenuItem* FindItemForId(int id);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);


@@ -321,11 +335,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 __WXGTK__
-    %name(FindItemForId) wxMenuItem* FindMenuItemById( int id );
-#endif
-#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);


@@ -349,21 +360,61 @@ public:
     bool IsCheckable();
     int  GetId();
     wxMenu* GetSubMenu();
     bool IsCheckable();
     int  GetId();
     wxMenu* GetSubMenu();

-#ifdef __WXMSW__

     void SetName(const wxString& strName);
     void SetName(const wxString& strName);

-    void DeleteSubMenu();

     const wxString& GetName();
     const wxString& GetName();

-#endif

     const wxString& GetHelp();
     void SetHelp(const wxString& strHelp);
     void Enable(bool bDoEnable = TRUE);
     void Check(bool bDoCheck = TRUE);
     const wxString& GetHelp();
     void SetHelp(const wxString& strHelp);
     void Enable(bool bDoEnable = TRUE);
     void Check(bool bDoCheck = TRUE);

+
+#ifdef __WXMSW__
+    void DeleteSubMenu();
+#endif

 };
 
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 };
 
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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
 // 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