wxUniversal fixes:

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 36c75d98d6d52e890bdb4d6131d46963ef054626..92f95b87da5c0080f28f925d04f5d422664a434c 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -28,13 +28,30 @@
 %import _defs.i
 
 
 %import _defs.i
 
 

+//---------------------------------------------------------------------------

 %{
 %{

-    static wxString wxPyEmptyStr("");
+    // Put some wx default wxChar* values into wxStrings.
+    static const wxString wxPyEmptyString(wxT(""));

 %}
 %}

-

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

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

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


@@ -54,11 +71,19 @@ public:
 
     %addmethods {
         PyObject* asTuple() {
 
     %addmethods {
         PyObject* asTuple() {

+            wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));

+            wxPyEndBlockThreads();

             return tup;
         }
             return tup;
         }

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

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


@@ -89,9 +114,11 @@ public:
             self->y = y;
         }
         PyObject* asTuple() {
             self->y = y;
         }
         PyObject* asTuple() {

+            wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));

+            wxPyEndBlockThreads();

             return tup;
         }
 
             return tup;
         }
 


@@ -106,8 +133,9 @@ public:
         }
 
         int __cmp__(const wxRealPoint* p) {
         }
 
         int __cmp__(const wxRealPoint* p) {

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

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


@@ -136,9 +164,11 @@ public:
             self->y = y;
         }
         PyObject* asTuple() {
             self->y = y;
         }
         PyObject* asTuple() {

+            wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));

+            wxPyEndBlockThreads();

             return tup;
         }
 
             return tup;
         }
 


@@ -153,8 +183,9 @@ public:
         }
 
         int __cmp__(const wxPoint* p) {
         }
 
         int __cmp__(const wxPoint* p) {

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

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


@@ -207,11 +238,13 @@ public:
 
     %addmethods {
         PyObject* asTuple() {
 
     %addmethods {
         PyObject* asTuple() {

+            wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(4);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
             PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));
             PyObject* tup = PyTuple_New(4);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
             PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));

+            wxPyEndBlockThreads();

             return tup;
         }
 
             return tup;
         }
 


@@ -221,8 +254,9 @@ 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;

         }
     }
 
         }
     }
 


@@ -290,13 +324,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");
             PyObject* one = PyInt_FromLong(1);
             PyObject_SetAttrString(obj, "thisown", one);
             Py_DECREF(one);
             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             PyObject* one = PyInt_FromLong(1);
             PyObject_SetAttrString(obj, "thisown", one);
             Py_DECREF(one);

-            wxPySaveThread(doSave);
+            wxPyEndBlockThreads();

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


@@ -315,7 +349,6 @@ void wxRegisterId(long id);
 long wxGetCurrentId();
 
 void wxBell();
 long wxGetCurrentId();
 
 void wxBell();

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

 void wxEndBusyCursor();
 
 long wxGetElapsedTime(bool resetTimer = TRUE);
 void wxEndBusyCursor();
 
 long wxGetElapsedTime(bool resetTimer = TRUE);


@@ -325,7 +358,7 @@ 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 = wxPyEmptyString);

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


@@ -337,8 +370,9 @@ bool wxYieldIfNeeded();
 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{
 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{

-    char* wxGetResource(char *section, char *entry, char *file = NULL) {
-        char * retval;
+    wxString wxGetResource(const wxString& section, const wxString& entry,
+                           const wxString& file = wxPyEmptyString) {
+        wxChar * retval;

         wxGetResource(section, entry, &retval, file);
         return retval;
     }
         wxGetResource(section, entry, &retval, file);
         return retval;
     }


@@ -353,8 +387,12 @@ wxString wxGetFullHostName();
 wxString wxGetUserId();
 wxString wxGetUserName();
 wxString wxGetHomeDir();
 wxString wxGetUserId();
 wxString wxGetUserName();
 wxString wxGetHomeDir();

+wxString wxGetUserHome(const wxString& user = wxPyEmptyString);

 
 
 
 

+// When wxApp gets the virtual method magic then enable this.
+// bool wxHandleFatalExceptions(bool doIt = TRUE);
+

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


@@ -370,7 +408,7 @@ enum wxRelationship { wxUnconstrained = 0,
                       wxAbsolute };
 
 
                       wxAbsolute };
 
 

-class wxIndividualLayoutConstraint {
+class wxIndividualLayoutConstraint : public wxObject {

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


@@ -388,7 +426,7 @@ public:
 };
 
 
 };
 
 

-class wxLayoutConstraints {
+class wxLayoutConstraints : public wxObject {

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


@@ -405,71 +443,6 @@ public:
 }
 
 
 }
 
 

-//---------------------------------------------------------------------------
-// Regions, etc.
-
-enum wxRegionContain {
-       wxOutRegion, wxPartRegion, wxInRegion
-};
-
-
-class wxRegion {
-public:
-    wxRegion(long x=0, long y=0, long width=0, long height=0);
-    ~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


@@ -486,7 +459,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);


@@ -509,12 +482,13 @@ extern wxAcceleratorTable wxNullAcceleratorTable;
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxBusyInfo {
+class wxBusyInfo : public wxObject {

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

+

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