Some compilation fixes

[wxWidgets.git] / wxPython / src / windows3.i

diff --git a/wxPython/src/windows3.i b/wxPython/src/windows3.i
index 8dbb317db0b09efbbfc80c0fd966cce873fdfdb5..570e9fba29c22213947dbf3807c187dbeeb99397 100644 (file)
--- a/wxPython/src/windows3.i
+++ b/wxPython/src/windows3.i
@@ -16,7 +16,10 @@
 #include "helpers.h"
 #include <wx/sashwin.h>
 #include <wx/laywin.h>
 #include "helpers.h"
 #include <wx/sashwin.h>
 #include <wx/laywin.h>

+#ifndef __WXMAC__

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

+#include <wx/tipwin.h>
+#endif

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


@@ -90,7 +93,7 @@ public:
                  const char* name = "sashWindow");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
                  const char* name = "sashWindow");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

-    %pragma(python) addtomethod = "wxPreSashWindow:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreSashWindow:val._setOORInfo(val)"

 
     bool GetSashVisible(wxSashEdgePosition edge);
     int GetDefaultBorderSize();
 
     bool GetSashVisible(wxSashEdgePosition edge);
     int GetDefaultBorderSize();


@@ -180,7 +183,7 @@ public:
                 const char* name = "layoutWindow");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
                 const char* name = "layoutWindow");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

-    %pragma(python) addtomethod = "wxPreSashLayoutWindow:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreSashLayoutWindow:val._setOORInfo(val)"

 
     wxLayoutAlignment GetAlignment();
     wxLayoutOrientation GetOrientation();
 
     wxLayoutAlignment GetAlignment();
     wxLayoutOrientation GetOrientation();


@@ -203,6 +206,7 @@ public:
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+#ifndef __WXMAC__

 
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
 
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.


@@ -212,10 +216,11 @@ public:
     %name(wxPrePopupWindow)wxPopupWindow();
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %name(wxPrePopupWindow)wxPopupWindow();
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

-    %pragma(python) addtomethod = "wxPrePopupWindow:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPrePopupWindow:val._setOORInfo(val)"

 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

+    // the point must be given in screen coordinates!

     void Position(const wxPoint& ptOrigin,
                   const wxSize& size);
 };
     void Position(const wxPoint& ptOrigin,
                   const wxSize& size);
 };


@@ -230,11 +235,12 @@ public:
         : wxPopupTransientWindow(parent, style) {}
 
     DEC_PYCALLBACK_BOOL_ME(ProcessLeftDown);
         : wxPopupTransientWindow(parent, style) {}
 
     DEC_PYCALLBACK_BOOL_ME(ProcessLeftDown);

+    DEC_PYCALLBACK__(OnDismiss);

     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_BOOL_ME(wxPyPopupTransientWindow, wxPopupTransientWindow, ProcessLeftDown);
     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_BOOL_ME(wxPyPopupTransientWindow, wxPopupTransientWindow, ProcessLeftDown);

-
+IMP_PYCALLBACK__(wxPyPopupTransientWindow, wxPopupTransientWindow, OnDismiss);

 %}
 
 
 %}
 
 


@@ -251,7 +257,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPopupTransientWindow)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPopupTransientWindow)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

-    %pragma(python) addtomethod = "wxPrePopupTransientWindow:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPrePopupTransientWindow:val._setOORInfo(val)"

 
     // popup the window (this will show it too) and keep focus at winFocus
     // (or itself if it's NULL), dismiss the popup if we lose focus
 
     // popup the window (this will show it too) and keep focus at winFocus
     // (or itself if it's NULL), dismiss the popup if we lose focus


@@ -263,3 +269,17 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+class wxTipWindow : public wxPyPopupTransientWindow
+{
+public:
+    wxTipWindow(wxWindow *parent,
+                const wxString& text,
+                wxCoord maxLength = 100);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+};
+
+
+//---------------------------------------------------------------------------
+
+#endif