correction for Mac OS compilation

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 81d212afdde41f5742a908d7e8ce18a6069bb88d..06fe54cb3bac54c47dd48f448788db51597c0009 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -141,7 +141,11 @@ wxWindow * wxGetActiveWindow();
 
 wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
 
 wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt);

+
+#ifdef __WXMSW__

 bool wxCheckForInterrupt(wxWindow *wnd);
 bool wxCheckForInterrupt(wxWindow *wnd);

+void wxFlushEvents();
+#endif

 
 //---------------------------------------------------------------------------
 // Resource System
 
 //---------------------------------------------------------------------------
 // Resource System


@@ -280,18 +284,10 @@ public:
     wxString GetTip();
     // *** Not in the "public" interface void SetWindow(wxWindow *win);
     wxWindow *GetWindow();
     wxString GetTip();
     // *** Not in the "public" interface void SetWindow(wxWindow *win);
     wxWindow *GetWindow();

-};

 
 

-
-%inline %{
-    void wxToolTip_Enable(bool flag) {
-        wxToolTip::Enable(flag);
-    }
-
-    void wxToolTip_SetDelay(long milliseconds) {
-        wxToolTip::SetDelay(milliseconds);
-    }
-%}
+    static void Enable(bool flag);
+    static void SetDelay(long milliseconds);
+};

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


@@ -469,7 +465,6 @@ bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup
 
 %{
 #include <wx/generic/dragimgg.h>
 
 %{
 #include <wx/generic/dragimgg.h>

-static wxPoint wxPyNullPoint;

 %}
 
 %name (wxDragImage) class wxGenericDragImage : public wxObject
 %}
 
 %name (wxDragImage) class wxGenericDragImage : public wxObject


@@ -477,10 +472,10 @@ static wxPoint wxPyNullPoint;
 public:
 
     wxGenericDragImage(const wxBitmap& image,
 public:
 
     wxGenericDragImage(const wxBitmap& image,

-                       const wxCursor& cursor = wxNullCursor,
-                       const wxPoint& hotspot = wxPyNullPoint);
+                       const wxCursor& cursor = wxNullCursor);

     ~wxGenericDragImage();
 
     ~wxGenericDragImage();
 

+    void SetBackingBitmap(wxBitmap* bitmap);

     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
                    bool fullScreen = FALSE, wxRect* rect = NULL);
 
     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
                    bool fullScreen = FALSE, wxRect* rect = NULL);
 


@@ -500,12 +495,10 @@ public:
 
 // Alternate Constructors
 %new wxGenericDragImage* wxDragIcon(const wxIcon& image,
 
 // Alternate Constructors
 %new wxGenericDragImage* wxDragIcon(const wxIcon& image,

-                                   const wxCursor& cursor = wxNullCursor,
-                                   const wxPoint& hotspot = wxPyNullPoint);
+                                   const wxCursor& cursor = wxNullCursor);

 
 %new wxGenericDragImage* wxDragString(const wxString& str,
 
 %new wxGenericDragImage* wxDragString(const wxString& str,

-                                      const wxCursor& cursor = wxNullCursor,
-                                      const wxPoint& hotspot = wxPyNullPoint);
+                                      const wxCursor& cursor = wxNullCursor);

 
 %new wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
 
 
 %new wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id);
 


@@ -515,15 +508,13 @@ public:
 %{
 
 wxGenericDragImage* wxDragIcon(const wxIcon& image,
 %{
 
 wxGenericDragImage* wxDragIcon(const wxIcon& image,

-                               const wxCursor& cursor,
-                               const wxPoint& hotspot) {
-    return new wxGenericDragImage(image, cursor, hotspot);
+                               const wxCursor& cursor) {
+    return new wxGenericDragImage(image, cursor);

 }
 
 wxGenericDragImage* wxDragString(const wxString& str,
 }
 
 wxGenericDragImage* wxDragString(const wxString& str,

-                                 const wxCursor& cursor,
-                                 const wxPoint& hotspot) {
-    return new wxGenericDragImage(str, cursor, hotspot);
+                                 const wxCursor& cursor) {
+    return new wxGenericDragImage(str, cursor);

 }
 
 wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) {
 }
 
 wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) {


@@ -748,7 +739,7 @@ public:
     int GetUPosition() { return -1; }
     int GetVPosition() { return -1; }
     int GetMovementThreshold() { return -1; }
     int GetUPosition() { return -1; }
     int GetVPosition() { return -1; }
     int GetMovementThreshold() { return -1; }

-    void SetMovementThreshold(int threshold) ;
+    void SetMovementThreshold(int threshold) {}

 
     bool IsOk(void) { return FALSE; }
     int GetNumberJoysticks() { return -1; }
 
     bool IsOk(void) { return FALSE; }
     int GetNumberJoysticks() { return -1; }


@@ -792,6 +783,8 @@ public:
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1);
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1);

+    ~wxJoystick();
+

     wxPoint GetPosition();
     int GetZPosition();
     int GetButtonState();
     wxPoint GetPosition();
     int GetZPosition();
     int GetButtonState();


@@ -842,7 +835,7 @@ public:
 //----------------------------------------------------------------------
 
 %{
 //----------------------------------------------------------------------
 
 %{

-#if !wxUSE_WAVE && !defined(__WXMSW__)
+#if !wxUSE_WAVE

 // A C++ stub class for wxWave for platforms that don't have it.
 class wxWave : public wxObject
 {
 // A C++ stub class for wxWave for platforms that don't have it.
 class wxWave : public wxObject
 {