%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;
%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));
+ wxPyEndBlockThreads();
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())
def __repr__(self): return str(self.asTuple())
- def __len__(self): return len(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
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));
+ wxPyEndBlockThreads();
return tup;
}
}
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 = "
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
- def __len__(self): return len(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
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));
+ wxPyEndBlockThreads();
return tup;
}
}
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 = "
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
- def __len__(self): return len(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
%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));
+ wxPyEndBlockThreads();
return tup;
}
}
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())
def __repr__(self): return str(self.asTuple())
- def __len__(self): return len(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
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);
- wxPySaveThread(doSave);
+ wxPyEndBlockThreads();
return obj;
}
Py_INCREF(Py_None);
void wxRegisterId(long id);
%name(NewId) long wxNewId();
%name(RegisterId) void wxRegisterId(long id);
+long wxGetCurrentId();
void wxBell();
-void wxDisplaySize(int *OUTPUT, int *OUTPUT);
void wxEndBusyCursor();
long wxGetElapsedTime(bool resetTimer = TRUE);
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 wxSleep(int secs);
void wxUsleep(unsigned long milliseconds);
bool wxYield();
+bool wxYieldIfNeeded();
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;
}
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,
wxAbsolute };
-class wxIndividualLayoutConstraint {
+class wxIndividualLayoutConstraint : public wxObject {
public:
// wxIndividualLayoutConstraint();
// ~wxIndividualLayoutConstraint();
};
-class wxLayoutConstraints {
+class wxLayoutConstraints : public wxObject {
public:
wxLayoutConstraints();
}
-//---------------------------------------------------------------------------
-// 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
};
-class wxAcceleratorTable {
+class wxAcceleratorTable : public wxObject {
public:
// Can also accept a list of 3-tuples
wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* choices);
//---------------------------------------------------------------------------
-class wxBusyInfo {
+class wxBusyInfo : public wxObject {
public:
wxBusyInfo(const wxString& message);
~wxBusyInfo();
};
+
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff