modified arguments syntax to be wx-config [options] [libraries list]

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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index 46a8589bcd654041546ee7a5ee4fa3e7982143e5..5ae57e1f9c51abe63c75b6283a58e58b64bc9d82 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -18,6 +18,10 @@
 %newgroup
 
 
+#ifndef __WXX11__
+
+MustHaveApp(wxToolTip);
+
 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);
@@ -30,9 +34,12 @@ public:
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);
 };
+#endif
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxCaret);
+
 class wxCaret {
 public:
     wxCaret(wxWindow* window, const wxSize& size);
@@ -40,10 +47,20 @@ public:
 
     bool IsOk();
     bool IsVisible();
-    %name(GetPositionTuple)void GetPosition(int *OUTPUT, int *OUTPUT);
+
     wxPoint GetPosition();
-    %name(GetSizeTuple)void GetSize(int *OUTPUT, int *OUTPUT);
+    DocDeclAName(
+        void, GetPosition(int *OUTPUT, int *OUTPUT),
+        "GetPositionTuple() -> (x,y)",
+        GetPositionTuple);
+
     wxSize GetSize();
+    DocDeclAName(
+        void, GetSize( int *OUTPUT, int *OUTPUT ),
+        "GetSizeTuple() -> (width, height)",
+        GetSizeTuple);
+    
+
     wxWindow *GetWindow();
     %name(MoveXY)void Move(int x, int y);
     void Move(const wxPoint& pt);
@@ -52,7 +69,7 @@ public:
     void Show(int show = True);
     void Hide();
 
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
 };
 
 %inline %{
@@ -67,6 +84,8 @@ public:
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxBusyCursor);
+
 class  wxBusyCursor {
 public:
     wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);
@@ -75,6 +94,8 @@ public:
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxWindowDisabler);
+
 class wxWindowDisabler {
 public:
     wxWindowDisabler(wxWindow *winToSkip = NULL);
@@ -83,6 +104,8 @@ public:
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxBusyInfo);
+
 class wxBusyInfo : public wxObject {
 public:
     wxBusyInfo(const wxString& message);
@@ -142,7 +165,7 @@ public:
     wxString GetHistoryFile(int i) const;
 
     int GetCount() const;
-    %pragma(python) addtoclass = "GetNoHistoryFiles = GetCount"
+    %pythoncode { GetNoHistoryFiles = GetCount }
 
 };