X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10e07c70d8161058e55d722686edbafb4688d243..922ba68045d84789ab1dfceb4d1aa1b6e2c5e810:/wxPython/src/misc2.i diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index 08d074c5c5..1e11812c29 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -30,6 +30,8 @@ #if wxUSE_WAVE || defined(__WXMSW__) #include #endif + +#include %} //---------------------------------------------------------------------- @@ -44,6 +46,7 @@ %import gdi.i %import events.i %import streams.i +%import utils.i %{ static wxString wxPyEmptyStr(""); @@ -141,7 +144,11 @@ wxWindow * wxGetActiveWindow(); wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt); wxWindow* wxFindWindowAtPoint(const wxPoint& pt); + +#ifdef __WXMSW__ bool wxCheckForInterrupt(wxWindow *wnd); +void wxFlushEvents(); +#endif //--------------------------------------------------------------------------- // Resource System @@ -280,18 +287,10 @@ public: wxString GetTip(); // *** Not in the "public" interface void SetWindow(wxWindow *win); wxWindow *GetWindow(); -}; - -%inline %{ - void wxToolTip_Enable(bool flag) { - wxToolTip::Enable(flag); - } - - void wxToolTip_SetDelay(long milliseconds) { - wxToolTip::SetDelay(milliseconds); - } -%} + static void Enable(bool flag); + static void SetDelay(long milliseconds); +}; //---------------------------------------------------------------------- @@ -348,8 +347,8 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc public: wxPyFontEnumerator(); ~wxPyFontEnumerator(); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxFontEnumerator)" + void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator, 0)" bool EnumerateFacenames( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all @@ -361,18 +360,12 @@ public: %addmethods { PyObject* GetEncodings() { wxArrayString* arr = self->GetEncodings(); - PyObject* list = PyList_New(0); - for (size_t x=0; xGetCount(); x++) - PyList_Append(list, PyString_FromString((*arr)[x])); - return list; + return wxArrayString2PyList_helper(*arr); } PyObject* GetFacenames() { wxArrayString* arr = self->GetFacenames(); - PyObject* list = PyList_New(0); - for (size_t x=0; xGetCount(); x++) - PyList_Append(list, PyString_FromString((*arr)[x])); - return list; + return wxArrayString2PyList_helper(*arr); } } }; @@ -417,7 +410,11 @@ public: %inline %{ bool wxThread_IsMain() { +#ifdef WXP_WITH_THREAD return wxThread::IsMain(); +#else + return TRUE; +#endif } %} @@ -477,6 +474,13 @@ public: wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor); + %name(wxDragIcon)wxGenericDragImage(const wxIcon& image, + const wxCursor& cursor = wxNullCursor); + %name(wxDragString)wxGenericDragImage(const wxString& str, + const wxCursor& cursor = wxNullCursor); + %name(wxDragTreeItem)wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); + %name(wxDragListItem)wxGenericDragImage(const wxListCtrl& listCtrl, long id); + ~wxGenericDragImage(); void SetBackingBitmap(wxBitmap* bitmap); @@ -497,42 +501,6 @@ public: }; -// Alternate Constructors -%new wxGenericDragImage* wxDragIcon(const wxIcon& image, - const wxCursor& cursor = wxNullCursor); - -%new wxGenericDragImage* wxDragString(const wxString& str, - const wxCursor& cursor = wxNullCursor); - -%new wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); - -%new wxGenericDragImage* wxDragListItem(const wxListCtrl& listCtrl, long id); - - -%{ - -wxGenericDragImage* wxDragIcon(const wxIcon& image, - const wxCursor& cursor) { - return new wxGenericDragImage(image, cursor); -} - -wxGenericDragImage* wxDragString(const wxString& str, - const wxCursor& cursor) { - return new wxGenericDragImage(str, cursor); -} - -wxGenericDragImage* wxDragTreeItem(const wxTreeCtrl& treeCtrl, wxTreeItemId& id) { - return new wxGenericDragImage(treeCtrl, id); -} - -wxGenericDragImage* wxDragListItem(const wxListCtrl& listCtrl, long id) { - return new wxGenericDragImage(listCtrl, id); -} - -%} - - - //---------------------------------------------------------------------- class wxPyTimer : public wxObject { @@ -547,6 +515,21 @@ public: void Stop(); }; + +class wxStopWatch +{ +public: + // ctor starts the stop watch + wxStopWatch(); + void Start(long t = 0); + void Pause(); + void Resume(); + + // get elapsed time since the last Start() or Pause() in milliseconds + long Time() const; +}; + + //---------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -591,12 +574,24 @@ public: static void SetTraceMask(wxTraceMask ulMask); static void AddTraceMask(const wxString& str); static void RemoveTraceMask(const wxString& str); + static void ClearTraceMasks(); + + static void SetTimestamp(const wxChar *ts); + static const wxChar *GetTimestamp(); bool GetVerbose() const { return m_bVerbose; } static wxTraceMask GetTraceMask(); static bool IsAllowedTraceMask(const char *mask); + // static void TimeStamp(wxString *str); + %addmethods { + wxString TimeStamp() { + wxString msg; + wxLog::TimeStamp(&msg); + return msg; + } + } }; @@ -644,6 +639,17 @@ public: }; +class wxLogChain : public wxLog +{ +public: + wxLogChain(wxLog *logger); + void SetLog(wxLog *logger); + void PassMessages(bool bDoPass); + bool IsPassingMessages(); + wxLog *GetOldLog(); +}; + + unsigned long wxSysErrorCode(); const char* wxSysErrorMsg(unsigned long nErrCode = 0); void wxLogFatalError(const char *szFormat); @@ -657,6 +663,46 @@ void wxLogStatus(const char *szFormat); void wxLogSysError(const char *szFormat); +%{ +// A Log class that can be derived from in wxPython +class wxPyLog : public wxLog { +public: + wxPyLog() : wxLog() {} + + virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) { + bool found; + wxPyTState* state = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(isi)", level, szString, t)); + wxPyEndBlockThreads(state); + if (! found) + wxLog::DoLog(level, szString, t); + } + + virtual void DoLogString(const wxChar *szString, time_t t) { + bool found; + wxPyTState* state = wxPyBeginBlockThreads(); + if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(si)", szString, t)); + wxPyEndBlockThreads(state); + if (! found) + wxLog::DoLogString(szString, t); + } + + PYPRIVATE; +}; +%} + +// Now tell SWIG about it +class wxPyLog : public wxLog { +public: + wxPyLog(); + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyLog)" + %addmethods { void Destroy() { delete self; } } + +}; + //---------------------------------------------------------------------- @@ -692,6 +738,7 @@ public: }; IMP_PYCALLBACK_VOID_INTINT( wxPyProcess, wxProcess, OnTerminate); + %} @@ -700,8 +747,8 @@ public: wxPyProcess(wxEvtHandler *parent = NULL, int id = -1); %addmethods { void Destroy() { delete self; } } - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxProcess)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxProcess)" void base_OnTerminate(int pid, int status); @@ -730,9 +777,9 @@ long wxExecute(const wxString& command, class wxJoystick : public wxObject { public: wxJoystick(int joystick = wxJOYSTICK1) { - bool doSave = wxPyRestoreThread(); + wxPyTState* state = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform."); - wxPySaveThread(doSave); + wxPyEndBlockThreads(state); } wxPoint GetPosition() { return wxPoint(-1,-1); } int GetZPosition() { return -1; } @@ -743,7 +790,7 @@ public: int GetUPosition() { return -1; } int GetVPosition() { return -1; } int GetMovementThreshold() { return -1; } - void SetMovementThreshold(int threshold) ; + void SetMovementThreshold(int threshold) {} bool IsOk(void) { return FALSE; } int GetNumberJoysticks() { return -1; } @@ -787,6 +834,8 @@ public: class wxJoystick : public wxObject { public: wxJoystick(int joystick = wxJOYSTICK1); + ~wxJoystick(); + wxPoint GetPosition(); int GetZPosition(); int GetButtonState(); @@ -837,20 +886,20 @@ public: //---------------------------------------------------------------------- %{ -#if !wxUSE_WAVE && !defined(__WXMSW__) +#if !wxUSE_WAVE // A C++ stub class for wxWave for platforms that don't have it. class wxWave : public wxObject { public: wxWave(const wxString& fileName, bool isResource = FALSE) { - bool doSave = wxPyRestoreThread(); + wxPyTState* state = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); - wxPySaveThread(doSave); + wxPyEndBlockThreads(state); } wxWave(int size, const wxByte* data) { - bool doSave = wxPyRestoreThread(); + wxPyTState* state = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform."); - wxPySaveThread(doSave); + wxPyEndBlockThreads(state); } ~wxWave() {} @@ -879,6 +928,397 @@ public: } %} + +//---------------------------------------------------------------------- + +enum wxMailcapStyle +{ + wxMAILCAP_STANDARD = 1, + wxMAILCAP_NETSCAPE = 2, + wxMAILCAP_KDE = 4, + wxMAILCAP_GNOME = 8, + + wxMAILCAP_ALL = 15 +}; + + + +class wxFileTypeInfo +{ +public: + // ctors + // a normal item + wxFileTypeInfo(const char *mimeType, + const char *openCmd, + const char *printCmd, + const char *desc); + + + // the array elements correspond to the parameters of the ctor above in + // the same order + %name(wxFileTypeInfoSequence)wxFileTypeInfo(const wxArrayString& sArray); + + // invalid item - use this to terminate the array passed to + // wxMimeTypesManager::AddFallbacks + %name(wxNullFileTypeInfo)wxFileTypeInfo(); + + + // test if this object can be used + bool IsValid() const; + + // setters + // set the icon info + void SetIcon(const wxString& iconFile, int iconIndex = 0); + + // set the short desc + void SetShortDesc(const wxString& shortDesc); + + // accessors + // get the MIME type + const wxString& GetMimeType() const; + // get the open command + const wxString& GetOpenCommand() const; + // get the print command + const wxString& GetPrintCommand() const; + // get the short description (only used under Win32 so far) + const wxString& GetShortDesc() const; + // get the long, user visible description + const wxString& GetDescription() const; + + + // get the array of all extensions + //const wxArrayString& GetExtensions() const; + %addmethods { + PyObject* GetExtensions() { + wxArrayString& arr = (wxArrayString&)self->GetExtensions(); + return wxArrayString2PyList_helper(arr); + } + } + + int GetExtensionsCount() const; + + // get the icon info + const wxString& GetIconFile() const; + int GetIconIndex() const; +}; + + + + +class wxFileType +{ +public: + + // TODO: Make a wxPyMessageParameters with virtual GetParamValue... + + // An object of this class must be passed to Get{Open|Print}Command. The + // default implementation is trivial and doesn't know anything at all about + // parameters, only filename and MIME type are used (so it's probably ok for + // Windows where %{param} is not used anyhow) + class MessageParameters + { + public: + // ctors + MessageParameters(const wxString& filename=wxPyEmptyStr, + const wxString& mimetype=wxPyEmptyStr); + + // accessors (called by GetOpenCommand) + // filename + const wxString& GetFileName() const; + // mime type + const wxString& GetMimeType() const;; + + // override this function in derived class + virtual wxString GetParamValue(const wxString& name) const; + + // virtual dtor as in any base class + virtual ~MessageParameters(); + }; + + + // ctor from static data + wxFileType(const wxFileTypeInfo& ftInfo); + + // return the MIME type for this file type + %addmethods { + PyObject* GetMimeType() { + wxString str; + if (self->GetMimeType(&str)) + return PyString_FromString(str.c_str()); + else + RETURN_NONE(); + } + PyObject* GetMimeTypes() { + wxArrayString arr; + if (self->GetMimeTypes(arr)) + return wxArrayString2PyList_helper(arr); + else + RETURN_NONE(); + } + } + + + // Get all extensions associated with this file type + %addmethods { + PyObject* GetExtensions() { + wxArrayString arr; + if (self->GetExtensions(arr)) + return wxArrayString2PyList_helper(arr); + else + RETURN_NONE(); + } + } + + + %addmethods { + // Get the icon corresponding to this file type + %new wxIcon* GetIcon() { + wxIcon icon; + if (self->GetIcon(&icon)) + return new wxIcon(icon); + else + return NULL; + } + + // Get the icon corresponding to this file type, the name of the file + // where this icon resides, and its index in this file if applicable. + PyObject* GetIconInfo() { + wxIcon icon; + wxString iconFile; + int iconIndex; + if (self->GetIcon(&icon, &iconFile, &iconIndex)) { + wxPyTState* state = wxPyBeginBlockThreads(); + PyObject* tuple = PyTuple_New(3); + PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon), + "wxIcon", TRUE)); + PyTuple_SetItem(tuple, 1, PyString_FromString(iconFile.c_str())); + PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex)); + wxPyEndBlockThreads(state); + return tuple; + } + else + RETURN_NONE(); + } + } + + %addmethods { + // get a brief file type description ("*.txt" => "text document") + PyObject* GetDescription() { + wxString str; + if (self->GetDescription(&str)) + return PyString_FromString(str.c_str()); + else + RETURN_NONE(); + } + } + + + // get the command to open/execute the file of given type + %addmethods { + PyObject* GetOpenCommand(const wxString& filename, + const wxString& mimetype=wxPyEmptyStr) { + wxString str; + if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype))) + return PyString_FromString(str.c_str()); + else + RETURN_NONE(); + } + } + + + // get the command to print the file of given type + %addmethods { + PyObject* GetPrintCommand(const wxString& filename, + const wxString& mimetype=wxPyEmptyStr) { + wxString str; + if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype))) + return PyString_FromString(str.c_str()); + else + RETURN_NONE(); + } + } + + + // Get all commands defined for this file type + %addmethods { + PyObject* GetAllCommands(const wxString& filename, + const wxString& mimetype=wxPyEmptyStr) { + wxArrayString verbs; + wxArrayString commands; + if (self->GetAllCommands(&verbs, &commands, + wxFileType::MessageParameters(filename, mimetype))) { + wxPyTState* state = wxPyBeginBlockThreads(); + PyObject* tuple = PyTuple_New(2); + PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs)); + PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands)); + wxPyEndBlockThreads(state); + return tuple; + } + else + RETURN_NONE(); + } + } + + + // set an arbitrary command, ask confirmation if it already exists and + // overwriteprompt is TRUE + bool SetCommand(const wxString& cmd, const wxString& verb, + bool overwriteprompt = TRUE); + + bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0); + + + // remove the association for this filetype from the system MIME database: + // notice that it will only work if the association is defined in the user + // file/registry part, we will never modify the system-wide settings + bool Unassociate(); + + // operations + // expand a string in the format of GetOpenCommand (which may contain + // '%s' and '%t' format specificators for the file name and mime type + // and %{param} constructions). + static wxString ExpandCommand(const wxString& command, + const MessageParameters& params); + + // dtor (not virtual, shouldn't be derived from) + ~wxFileType(); + +}; + + + + +class wxMimeTypesManager +{ +public: + // static helper functions + // ----------------------- + + // check if the given MIME type is the same as the other one: the + // second argument may contain wildcards ('*'), but not the first. If + // the types are equal or if the mimeType matches wildcard the function + // returns TRUE, otherwise it returns FALSE + static bool IsOfType(const wxString& mimeType, const wxString& wildcard); + + // ctor + wxMimeTypesManager(); + + // loads data from standard files according to the mailcap styles + // specified: this is a bitwise OR of wxMailcapStyle values + // + // use the extraDir parameter if you want to look for files in another + // directory + void Initialize(int mailcapStyle = wxMAILCAP_STANDARD, + const wxString& extraDir = wxEmptyString); + + // and this function clears all the data from the manager + void ClearData(); + + // Database lookup: all functions return a pointer to wxFileType object + // whose methods may be used to query it for the information you're + // interested in. If the return value is !NULL, caller is responsible for + // deleting it. + // get file type from file extension + %new wxFileType *GetFileTypeFromExtension(const wxString& ext); + + // get file type from MIME type (in format /) + %new wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); + + // other operations: return TRUE if there were no errors or FALSE if there + // were some unreckognized entries (the good entries are always read anyhow) + // + + // read in additional file (the standard ones are read automatically) + // in mailcap format (see mimetype.cpp for description) + // + // 'fallback' parameter may be set to TRUE to avoid overriding the + // settings from other, previously parsed, files by this one: normally, + // the files read most recently would override the older files, but with + // fallback == TRUE this won't happen + bool ReadMailcap(const wxString& filename, bool fallback = FALSE); + + // read in additional file in mime.types format + bool ReadMimeTypes(const wxString& filename); + + // enumerate all known MIME types + %addmethods { + PyObject* EnumAllFileTypes() { + wxArrayString arr; + self->EnumAllFileTypes(arr); + return wxArrayString2PyList_helper(arr); + } + } + + // these functions can be used to provide default values for some of the + // MIME types inside the program itself (you may also use + // ReadMailcap(filenameWithDefaultTypes, TRUE /* use as fallback */) to + // achieve the same goal, but this requires having this info in a file). + // + void AddFallback(const wxFileTypeInfo& ft); + + + // create or remove associations + + // create a new association using the fields of wxFileTypeInfo (at least + // the MIME type and the extension should be set) + // if the other fields are empty, the existing values should be left alone + %new wxFileType *Associate(const wxFileTypeInfo& ftInfo); + + // undo Associate() + bool Unassociate(wxFileType *ft) ; + + // dtor (not virtual, shouldn't be derived from) + ~wxMimeTypesManager(); +}; + + +%readonly +%{ +#if 0 +%} +extern wxMimeTypesManager* wxTheMimeTypesManager; +%{ +#endif +%} +%readwrite + +//---------------------------------------------------------------------- + +%{ +#include +%} + +class wxFileHistory : public wxObject +{ +public: + wxFileHistory(int maxFiles = 9); + ~wxFileHistory(); + + // Operations + void AddFileToHistory(const wxString& file); + void RemoveFileFromHistory(int i); + int GetMaxFiles() const; + void UseMenu(wxMenu *menu); + + // Remove menu from the list (MDI child may be closing) + void RemoveMenu(wxMenu *menu); + + void Load(wxConfigBase& config); + void Save(wxConfigBase& config); + + void AddFilesToMenu(); + %name(AddFilesToSingleMenu)void AddFilesToMenu(wxMenu* menu); + + // Accessors + wxString GetHistoryFile(int i) const; + + // A synonym for GetNoHistoryFiles + int GetCount() const; + int GetNoHistoryFiles() const; + +}; + +//---------------------------------------------------------------------- //----------------------------------------------------------------------