grid/dbgrid was not getting built for inclusion with this project

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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index 46a8589bcd654041546ee7a5ee4fa3e7982143e5..a1f6e305f1ca12599e302298407241c876d3e0e9 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -18,6 +18,7 @@
 %newgroup
 
 
 %newgroup
 
 

+#ifndef __WXX11__

 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);
 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);


@@ -30,6 +31,7 @@ public:
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);
 };
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);
 };

+#endif

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


@@ -40,10 +42,20 @@ public:
 
     bool IsOk();
     bool IsVisible();
 
     bool IsOk();
     bool IsVisible();

-    %name(GetPositionTuple)void GetPosition(int *OUTPUT, int *OUTPUT);
+

     wxPoint GetPosition();
     wxPoint GetPosition();

-    %name(GetSizeTuple)void GetSize(int *OUTPUT, int *OUTPUT);
+    DocDeclAName(
+        void, GetPosition(int *OUTPUT, int *OUTPUT),
+        "GetPositionTuple() -> (x,y)",
+        GetPositionTuple);
+

     wxSize GetSize();
     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);
     wxWindow *GetWindow();
     %name(MoveXY)void Move(int x, int y);
     void Move(const wxPoint& pt);


@@ -52,7 +64,7 @@ public:
     void Show(int show = True);
     void Hide();
 
     void Show(int show = True);
     void Hide();
 

-    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"
+    %pythoncode { def __nonzero__(self): return self.IsOk() }

 };
 
 %inline %{
 };
 
 %inline %{


@@ -142,7 +154,7 @@ public:
     wxString GetHistoryFile(int i) const;
 
     int GetCount() const;
     wxString GetHistoryFile(int i) const;
 
     int GetCount() const;

-    %pragma(python) addtoclass = "GetNoHistoryFiles = GetCount"
+    %pythoncode { GetNoHistoryFiles = GetCount }

 
 };
 
 
 };