[start of] a wxUniversal implementation of wxToolBar

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 6f0312e99e484ba5ce7e18521cdfc8245dbff0d0..836af80a10b3f17caa612d65163e70c669d04a9d 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -31,6 +31,22 @@
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

+class wxObject {
+public:
+
+    %addmethods {
+        const char* GetClassName() {
+            return self->GetClassInfo()->GetClassName();
+        }
+
+        void Destroy() {
+            delete self;
+        }
+    }
+};
+
+//---------------------------------------------------------------------------
+

 class wxSize {
 public:
     long x;
 class wxSize {
 public:
     long x;


@@ -55,9 +71,24 @@ public:
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }

+
+        int __cmp__(const wxSize* sz) {
+            if (! sz) return 1;
+            if (*self == *sz) return 0;
+            return -1;
+        }

     }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.width = val
+        elif index == 1: self.height = val
+        else: raise IndexError
+"

 
 };
 
 
 };
 


@@ -81,9 +112,33 @@ public:
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
             return tup;
         }
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
             return tup;
         }

+
+        wxRealPoint __add__(const wxRealPoint* p) {
+            if (! p) return *self;
+            return *self + *p;
+        }
+
+        wxRealPoint __sub__(const wxRealPoint* p) {
+            if (! p) return *self;
+            return *self - *p;
+        }
+
+        int __cmp__(const wxRealPoint* p) {
+            if (! p) return 1;
+            if (*self == *p) return 0;
+            return -1;
+        }

     }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.width = val
+        elif index == 1: self.height = val
+        else: raise IndexError
+"

 };
 
 
 };
 
 


@@ -105,9 +160,33 @@ public:
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }

+
+        wxPoint __add__(const wxPoint* p) {
+            if (! p) return *self;
+            return *self + *p;
+        }
+
+        wxPoint __sub__(const wxPoint* p) {
+            if (! p) return *self;
+            return *self - *p;
+        }
+
+        int __cmp__(const wxPoint* p) {
+            if (! p) return 1;
+            if (*self == *p) return 0;
+            return -1;
+        }

     }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
+        else: raise IndexError
+"

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -162,14 +241,24 @@ public:
         }
 
         int __cmp__(const wxRect* rect) {
         }
 
         int __cmp__(const wxRect* rect) {

-            if (! rect) return 0;
-            return *self == *rect;
+            if (! rect) return 1;
+            if (*self == *rect) return 0;
+            return -1;

         }
     }
 
         }
     }
 

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"

     %pragma(python) addtoclass = "
     %pragma(python) addtoclass = "

+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
+        elif index == 2: self.width = val
+        elif index == 3: self.height = val
+        else: raise IndexError
+

     # override the __getattr__ made by SWIG
     def __getattr__(self, name):
         d = {
     # override the __getattr__ made by SWIG
     def __getattr__(self, name):
         d = {


@@ -222,11 +311,13 @@ public:
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {

-            bool doSave = wxPyRestoreThread();
+            wxPyBeginBlockThreads();

             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");

-            PyObject_SetAttrString(obj, "thisown", PyInt_FromLong(1));
-            wxPySaveThread(doSave);
+            PyObject* one = PyInt_FromLong(1);
+            PyObject_SetAttrString(obj, "thisown", one);
+            Py_DECREF(one);
+            wxPyEndBlockThreads();

             return obj;
         }
         Py_INCREF(Py_None);
             return obj;
         }
         Py_INCREF(Py_None);


@@ -242,11 +333,11 @@ long wxNewId();
 void wxRegisterId(long id);
 %name(NewId) long wxNewId();
 %name(RegisterId) void wxRegisterId(long id);
 void wxRegisterId(long id);
 %name(NewId) long wxNewId();
 %name(RegisterId) void wxRegisterId(long id);

+long wxGetCurrentId();

 
 void wxBell();
 
 void wxBell();

-void wxDisplaySize(int *OUTPUT, int *OUTPUT);

 void wxEndBusyCursor();
 void wxEndBusyCursor();

-long wxExecute(const wxString& command, int sync = FALSE);
+

 long wxGetElapsedTime(bool resetTimer = TRUE);
 #ifdef __WXMSW__
 long wxGetFreeMemory();
 long wxGetElapsedTime(bool resetTimer = TRUE);
 #ifdef __WXMSW__
 long wxGetFreeMemory();


@@ -254,13 +345,15 @@ long wxGetFreeMemory();
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();
 void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
 bool wxIsBusy();
 wxString wxNow();

-bool wxShell(const wxString& command = wxPyEmptyStr);
+bool wxShell(const wxString& command = wxEmptyString);

 void wxStartTimer();
 int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
 void wxStartTimer();
 int wxGetOsVersion(int *OUTPUT, int *OUTPUT);

+wxString wxGetOsDescription();

 
 void wxSleep(int secs);
 
 void wxSleep(int secs);

+void wxUsleep(unsigned long milliseconds);

 bool wxYield();
 bool wxYield();

-bool wxSafeYield();
+bool wxYieldIfNeeded();

 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{
 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{


@@ -273,6 +366,15 @@ void wxEnableTopLevelWindows(bool enable);
 
 wxString wxStripMenuCodes(const wxString& in);
 
 
 wxString wxStripMenuCodes(const wxString& in);
 

+
+wxString wxGetEmailAddress();
+wxString wxGetHostName();
+wxString wxGetFullHostName();
+wxString wxGetUserId();
+wxString wxGetUserName();
+wxString wxGetHomeDir();
+wxString wxGetUserHome(const char* user = "");
+

 //----------------------------------------------------------------------
 
 enum wxEdge { wxLeft, wxTop, wxRight, wxBottom, wxWidth, wxHeight,
 //----------------------------------------------------------------------
 
 enum wxEdge { wxLeft, wxTop, wxRight, wxBottom, wxWidth, wxHeight,


@@ -288,7 +390,7 @@ enum wxRelationship { wxUnconstrained = 0,
                       wxAbsolute };
 
 
                       wxAbsolute };
 
 

-class wxIndividualLayoutConstraint {
+class wxIndividualLayoutConstraint : public wxObject {

 public:
 //    wxIndividualLayoutConstraint();
 //    ~wxIndividualLayoutConstraint();
 public:
 //    wxIndividualLayoutConstraint();
 //    ~wxIndividualLayoutConstraint();


@@ -306,7 +408,7 @@ public:
 };
 
 
 };
 
 

-class wxLayoutConstraints {
+class wxLayoutConstraints : public wxObject {

 public:
     wxLayoutConstraints();
 
 public:
     wxLayoutConstraints();
 


@@ -323,71 +425,6 @@ public:
 }
 
 
 }
 
 

-//---------------------------------------------------------------------------
-// Regions, etc.
-
-enum wxRegionContain {
-       wxOutRegion, wxPartRegion, wxInRegion
-};
-
-
-class wxRegion {
-public:
-    wxRegion();
-    ~wxRegion();
-
-    void Clear();
-    wxRegionContain Contains(long x, long y);
-    %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
-    %name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
-    %name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
-
-    wxRect GetBox();
-
-    bool Intersect(long x, long y, long width, long height);
-    %name(IntersectRect)bool Intersect(const wxRect& rect);
-    %name(IntersectRegion)bool Intersect(const wxRegion& region);
-
-    bool IsEmpty();
-
-    bool Union(long x, long y, long width, long height);
-    %name(UnionRect)bool Union(const wxRect& rect);
-    %name(UnionRegion)bool Union(const wxRegion& region);
-
-    bool Subtract(long x, long y, long width, long height);
-    %name(SubtractRect)bool Subtract(const wxRect& rect);
-    %name(SubtractRegion)bool Subtract(const wxRegion& region);
-
-    bool Xor(long x, long y, long width, long height);
-    %name(XorRect)bool Xor(const wxRect& rect);
-    %name(XorRegion)bool Xor(const wxRegion& region);
-};
-
-
-
-class wxRegionIterator {
-public:
-    wxRegionIterator(const wxRegion& region);
-    ~wxRegionIterator();
-
-    long GetX();
-    long GetY();
-    long GetW();
-    long GetWidth();
-    long GetH();
-    long GetHeight();
-    wxRect GetRect();
-    bool HaveRects();
-    void Reset();
-
-    %addmethods {
-        void Next() {
-            (*self) ++;
-        }
-    };
-};
-
-

 
 //---------------------------------------------------------------------------
 // Accelerator Entry and Table
 
 //---------------------------------------------------------------------------
 // Accelerator Entry and Table


@@ -404,7 +441,7 @@ public:
 };
 
 
 };
 
 

-class wxAcceleratorTable {
+class wxAcceleratorTable : public wxObject {

 public:
     // Can also accept a list of 3-tuples
     wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* choices);
 public:
     // Can also accept a list of 3-tuples
     wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* choices);


@@ -412,6 +449,7 @@ public:
 
 };
 
 
 };
 

+wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);

 
 %readonly
 %{
 
 %readonly
 %{


@@ -426,14 +464,13 @@ extern wxAcceleratorTable wxNullAcceleratorTable;
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxBusyInfo {
+class wxBusyInfo : public wxObject {

 public:
     wxBusyInfo(const wxString& message);
     ~wxBusyInfo();
 };
 
 public:
     wxBusyInfo(const wxString& message);
     ~wxBusyInfo();
 };
 

-
-

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

+