%pragma(python) code = "import wx"
+//---------------------------------------------------------------------------
+%{
+ // Put some wx default wxChar* values into wxStrings.
+ static const wxString wxPyEmptyString(wxT(""));
+%}
//----------------------------------------------------------------------
enum wxDataFormatId
{
- wxDF_INVALID = 0,
- wxDF_TEXT = 1, /* CF_TEXT */
- wxDF_BITMAP = 2, /* CF_BITMAP */
- wxDF_METAFILE = 3, /* CF_METAFILEPICT */
- wxDF_SYLK = 4,
- wxDF_DIF = 5,
- wxDF_TIFF = 6,
- wxDF_OEMTEXT = 7, /* CF_OEMTEXT */
- wxDF_DIB = 8, /* CF_DIB */
- wxDF_PALETTE = 9,
- wxDF_PENDATA = 10,
- wxDF_RIFF = 11,
- wxDF_WAVE = 12,
- wxDF_UNICODETEXT = 13,
- wxDF_ENHMETAFILE = 14,
- wxDF_FILENAME = 15, /* CF_HDROP */
- wxDF_LOCALE = 16,
- wxDF_PRIVATE = 20,
- wxDF_MAX
+ wxDF_INVALID,
+ wxDF_TEXT,
+ wxDF_BITMAP,
+ wxDF_METAFILE,
+ wxDF_SYLK,
+ wxDF_DIF,
+ wxDF_TIFF,
+ wxDF_OEMTEXT,
+ wxDF_DIB,
+ wxDF_PALETTE,
+ wxDF_PENDATA,
+ wxDF_RIFF,
+ wxDF_WAVE,
+ wxDF_UNICODETEXT,
+ wxDF_ENHMETAFILE,
+ wxDF_FILENAME,
+ wxDF_LOCALE,
+ wxDF_PRIVATE,
+ wxDF_HTML,
+ wxDF_MAX,
};
//----------------------------------------------------------------------
wxDataFormatId GetType() const;
wxString GetId() const;
- void SetId(const char *format);
+ void SetId(const wxString& format);
};
%new wxDataFormat* wxCustomDataFormat(const wxString &id);
wxDataFormat GetPreferredFormat(Direction dir = wxDataObject::Get);
size_t GetFormatCount(Direction dir = wxDataObject::Get);
+
+ // TODO: Fix these two to be usable from wxPython.
void GetAllFormats(wxDataFormat *formats,
Direction dir = wxDataObject::Get);
- size_t GetDataSize(const wxDataFormat& format);
bool GetDataHere(const wxDataFormat& format, void *buf);
+
+ size_t GetDataSize(const wxDataFormat& format);
bool SetData(const wxDataFormat& format,
size_t len, const void * buf);
bool IsSupportedFormat(const wxDataFormat& format);
// C++ version.
bool rval = FALSE;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (m_myInst.findCallback("GetDataHere")) {
PyObject* ro;
ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return rval;
}
// For this one we simply need to make a string from buf and len
// and send it to the Python method.
bool rval = FALSE;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (m_myInst.findCallback("SetData")) {
PyObject* data = PyString_FromStringAndSize((char*)buf, len);
rval = m_myInst.callCallback(Py_BuildValue("(O)", data));
Py_DECREF(data);
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return rval;
}
%}
class wxTextDataObject : public wxDataObjectSimple {
public:
- wxTextDataObject(const wxString& text = wxEmptyString);
+ wxTextDataObject(const wxString& text = wxPyEmptyString);
size_t GetTextLength();
wxString GetText();
%{ // Create a new class for wxPython to use
class wxPyTextDataObject : public wxTextDataObject {
public:
- wxPyTextDataObject(const wxString& text = wxEmptyString)
+ wxPyTextDataObject(const wxString& text = wxPyEmptyString)
: wxTextDataObject(text) {}
DEC_PYCALLBACK_SIZET_(GetTextLength);
// Now define it for SWIG
class wxPyTextDataObject : public wxTextDataObject {
public:
- wxPyTextDataObject(const wxString& text = wxEmptyString);
+ wxPyTextDataObject(const wxString& text = wxPyEmptyString);
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyTextDataObject)"
};
wxBitmap wxPyBitmapDataObject::GetBitmap() {
wxBitmap* rval = &wxNullBitmap;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (m_myInst.findCallback("GetBitmap")) {
PyObject* ro;
wxBitmap* ptr;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return *rval;
}
void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (m_myInst.findCallback("SetBitmap")) {
- m_myInst.callCallback(Py_BuildValue("(O)",
- wxPyConstructObject((void*)&bitmap, "wxBitmap")));
+ PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"));
+ m_myInst.callCallback(Py_BuildValue("(O)", bo));
+ Py_DECREF(bo);
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
}
%}
%addmethods {
PyObject* GetFilenames() {
const wxArrayString& strings = self->GetFilenames();
- PyObject* list = PyList_New(0);
- for (size_t x=0; x<strings.GetCount(); x++)
- PyList_Append(list, PyString_FromString(strings[x]));
- return list;
+ return wxArrayString2PyList_helper(strings);
}
}
#ifdef __WXMSW__
};
+//----------------------------------------------------------------------
+
+class wxURLDataObject : public wxDataObjectComposite {
+public:
+ wxURLDataObject();
+
+ wxString GetURL();
+ void SetURL(const wxString& url);
+};
+
+//----------------------------------------------------------------------
+
+#ifndef __WXGTK__
+
+%{
+#include <wx/metafile.h>
+%}
+
+class wxMetafileDataObject : public wxDataObjectSimple
+{
+public:
+ wxMetafileDataObject();
+
+ void SetMetafile(const wxMetafile& metafile);
+ wxMetafile GetMetafile() const;
+};
+
+#endif
//----------------------------------------------------------------------
//----------------------------------------------------------------------
void UsePrimarySelection( int primary = FALSE );
};
+
+%readonly
%{
- // See below in the init function...
- wxClipboard* wxPyTheClipboard;
+#if 0
+%}
+// See also wxPy_ReinitStockObjects in helpers.cpp
+extern wxClipboard* wxTheClipboard;
+%{
+#endif
%}
-%readonly
-%name(wxTheClipboard) wxClipboard* wxPyTheClipboard;
%readwrite
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+// flags for wxDropSource::DoDragDrop()
+//
+enum
+{
+ wxDrag_CopyOnly = 0, // allow only copying
+ wxDrag_AllowMove = 1, // allow moving (copying is always allowed)
+ wxDrag_DefaultMove = 3 // the default operation is move, not copy
+};
+
enum wxDragResult
{
wxDragError, // error prevented the d&d operation from completing
wxDragNone, // drag target didn't accept the data
wxDragCopy, // the data was successfully copied
wxDragMove, // the data was successfully moved (MSW only)
+ wxDragLink, // operation is a drag-link
wxDragCancel // the operation was cancelled by user (not an error)
};
%{
class wxPyDropSource : public wxDropSource {
public:
-#ifdef __WXMSW__
- wxPyDropSource(wxWindow *win = NULL,
- const wxCursor &cursorCopy = wxNullCursor,
- const wxCursor &cursorMove = wxNullCursor,
- const wxCursor &cursorStop = wxNullCursor)
- : wxDropSource(win, cursorCopy, cursorMove, cursorStop) {}
+#ifndef __WXGTK__
+ wxPyDropSource(wxWindow *win = NULL,
+ const wxCursor © = wxNullCursor,
+ const wxCursor &move = wxNullCursor,
+ const wxCursor &none = wxNullCursor)
+ : wxDropSource(win, copy, move, none) {}
#else
wxPyDropSource(wxWindow *win = NULL,
- const wxIcon &go = wxNullIcon)
- : wxDropSource(win, go) {}
+ const wxIcon& copy = wxNullIcon,
+ const wxIcon& move = wxNullIcon,
+ const wxIcon& none = wxNullIcon)
+ : wxDropSource(win, copy, move, none) {}
#endif
~wxPyDropSource() { }
%name(wxDropSource) class wxPyDropSource {
public:
-#ifdef __WXMSW__
- wxPyDropSource(wxWindow *win = NULL,
- const wxCursor &cursorCopy = wxNullCursor,
- const wxCursor &cursorMove = wxNullCursor,
- const wxCursor &cursorStop = wxNullCursor);
+#ifndef __WXGTK__
+ wxPyDropSource(wxWindow *win = NULL,
+ const wxCursor © = wxNullCursor,
+ const wxCursor &move = wxNullCursor,
+ const wxCursor &none = wxNullCursor);
#else
wxPyDropSource(wxWindow *win = NULL,
- const wxIcon &go = wxNullIcon);
+ const wxIcon& copy = wxNullIcon,
+ const wxIcon& move = wxNullIcon,
+ const wxIcon& none = wxNullIcon);
#endif
void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
void SetData(wxDataObject& data);
wxDataObject *GetDataObject();
void SetCursor(wxDragResult res, const wxCursor& cursor);
- wxDragResult DoDragDrop(int bAllowMove = FALSE);
+ wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
bool base_GiveFeedback(wxDragResult effect);
};
bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
const wxArrayString& filenames) {
bool rval = FALSE;
- wxPyTState* state = wxPyBeginBlockThreads();
- PyObject* list = PyList_New(0);
- for (size_t i=0; i<filenames.GetCount(); i++) {
- PyObject* str = PyString_FromString(filenames[i].c_str());
- PyList_Append(list, str);
- }
- if (m_myInst.findCallback("OnDropFiles"))
+ wxPyBeginBlockThreads();
+ if (m_myInst.findCallback("OnDropFiles")) {
+ PyObject* list = wxArrayString2PyList_helper(filenames);
rval = m_myInst.callCallback(Py_BuildValue("(iiO)",x,y,list));
- Py_DECREF(list);
- wxPyEndBlockThreads(state);
+ Py_DECREF(list);
+ }
+ wxPyEndBlockThreads();
return rval;
}
%init %{
- wxPyTheClipboard = wxTheClipboard;
wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
//----------------------------------------------------------------------
+
projects / wxWidgets.git / blobdiff