%{
#include "helpers.h"
+#include "pyistream.h"
#include <wx/resource.h>
#include <wx/tooltip.h>
#include <wx/caret.h>
-#include <wx/fontenum.h>
#include <wx/tipdlg.h>
#include <wx/process.h>
%import streams.i
%import utils.i
+
+//----------------------------------------------------------------------
+
%{
- static wxString wxPyEmptyStr("");
+ // Put some wx default wxChar* values into wxStrings.
+ DECLARE_DEF_STRING(FileSelectorPromptStr);
+ DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
+ DECLARE_DEF_STRING(DirSelectorPromptStr);
+ static const wxString wxPyEmptyString(wxT(""));
%}
//---------------------------------------------------------------------------
// Dialog Functions
-wxString wxFileSelector(char* message,
- char* default_path = NULL,
- char* default_filename = NULL,
- char* default_extension = NULL,
- char* wildcard = "*.*",
+wxString wxFileSelector(const wxString& message = wxPyFileSelectorPromptStr,
+ const wxString& default_path = wxPyEmptyString,
+ const wxString& default_filename = wxPyEmptyString,
+ const wxString& default_extension = wxPyEmptyString,
+ const wxString& wildcard = wxPyFileSelectorDefaultWildcardStr,
int flags = 0,
wxWindow *parent = NULL,
int x = -1, int y = -1);
+// Ask for filename to load
+wxString wxLoadFileSelector(const wxString& what,
+ const wxString& extension,
+ const wxString& default_name = wxPyEmptyString,
+ wxWindow *parent = NULL);
+
+// Ask for filename to save
+wxString wxSaveFileSelector(const wxString& what,
+ const wxString& extension,
+ const wxString& default_name = wxPyEmptyString,
+ wxWindow *parent = NULL);
+
+
+wxString wxDirSelector(const wxString& message = wxPyDirSelectorPromptStr,
+ const wxString& defaultPath = wxPyEmptyString,
+ long style = wxDD_DEFAULT_STYLE,
+ const wxPoint& pos = wxDefaultPosition,
+ wxWindow *parent = NULL);
+
wxString wxGetTextFromUser(const wxString& message,
- const wxString& caption = wxPyEmptyStr,
- const wxString& default_value = wxPyEmptyStr,
+ const wxString& caption = wxPyEmptyString,
+ const wxString& default_value = wxPyEmptyString,
wxWindow *parent = NULL,
int x = -1, int y = -1,
bool centre = TRUE);
wxString wxGetPasswordFromUser(const wxString& message,
- const wxString& caption = wxPyEmptyStr,
- const wxString& default_value = wxPyEmptyStr,
+ const wxString& caption = wxPyEmptyString,
+ const wxString& default_value = wxPyEmptyString,
wxWindow *parent = NULL);
int wxMessageBox(const wxString& message,
- const wxString& caption = wxPyEmptyStr,
+ const wxString& caption = wxPyEmptyString,
int style = wxOK | wxCENTRE,
wxWindow *parent = NULL,
int x = -1, int y = -1);
//----------------------------------------------------------------------
// Miscellaneous functions
-wxWindow * wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL);
-wxWindow * wxFindWindowByName(const wxString& name, wxWindow *parent=NULL);
-
void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
wxWindow * wxGetActiveWindow();
void wxFlushEvents();
#endif
+wxWindow* wxGetTopLevelParent(wxWindow *win);
+
//---------------------------------------------------------------------------
// Resource System
-bool wxResourceAddIdentifier(char *name, int value);
+bool wxResourceAddIdentifier(char* name, int value);
void wxResourceClear(void);
-wxBitmap wxResourceCreateBitmap(char *resource);
-wxIcon wxResourceCreateIcon(char *resource);
-wxMenuBar * wxResourceCreateMenuBar(char *resource);
-int wxResourceGetIdentifier(char *name);
-bool wxResourceParseData(char *resource, wxResourceTable *table = NULL);
-bool wxResourceParseFile(char *filename, wxResourceTable *table = NULL);
-bool wxResourceParseString(char *resource, wxResourceTable *table = NULL);
+wxBitmap wxResourceCreateBitmap(char* resource);
+wxIcon wxResourceCreateIcon(char* resource);
+wxMenuBar * wxResourceCreateMenuBar(char* resource);
+int wxResourceGetIdentifier(char* name);
+bool wxResourceParseData(char* resource, wxResourceTable *table = NULL);
+bool wxResourceParseFile(char* filename, wxResourceTable *table = NULL);
+bool wxResourceParseString(char* resource, wxResourceTable *table = NULL);
//---------------------------------------------------------------------------
// System Settings
-enum {
- wxSYS_WHITE_BRUSH,
- wxSYS_LTGRAY_BRUSH,
- wxSYS_GRAY_BRUSH,
- wxSYS_DKGRAY_BRUSH,
- wxSYS_BLACK_BRUSH,
- wxSYS_NULL_BRUSH,
- wxSYS_HOLLOW_BRUSH,
- wxSYS_WHITE_PEN,
- wxSYS_BLACK_PEN,
- wxSYS_NULL_PEN,
- wxSYS_OEM_FIXED_FONT,
+// possible values for wxSystemSettings::GetFont() parameter
+//
+enum wxSystemFont
+{
+ wxSYS_OEM_FIXED_FONT = 10,
wxSYS_ANSI_FIXED_FONT,
wxSYS_ANSI_VAR_FONT,
wxSYS_SYSTEM_FONT,
wxSYS_DEVICE_DEFAULT_FONT,
wxSYS_DEFAULT_PALETTE,
wxSYS_SYSTEM_FIXED_FONT,
- wxSYS_DEFAULT_GUI_FONT,
+ wxSYS_DEFAULT_GUI_FONT
+};
+// possible values for wxSystemSettings::GetColour() parameter
+//
+enum wxSystemColour
+{
wxSYS_COLOUR_SCROLLBAR,
wxSYS_COLOUR_BACKGROUND,
+ wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,
wxSYS_COLOUR_ACTIVECAPTION,
wxSYS_COLOUR_INACTIVECAPTION,
wxSYS_COLOUR_MENU,
wxSYS_COLOUR_HIGHLIGHT,
wxSYS_COLOUR_HIGHLIGHTTEXT,
wxSYS_COLOUR_BTNFACE,
+ wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
wxSYS_COLOUR_BTNSHADOW,
+ wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
wxSYS_COLOUR_GRAYTEXT,
wxSYS_COLOUR_BTNTEXT,
wxSYS_COLOUR_INACTIVECAPTIONTEXT,
wxSYS_COLOUR_BTNHIGHLIGHT,
-
+ wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+ wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+ wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
wxSYS_COLOUR_3DDKSHADOW,
wxSYS_COLOUR_3DLIGHT,
wxSYS_COLOUR_INFOTEXT,
wxSYS_COLOUR_INFOBK,
+ wxSYS_COLOUR_LISTBOX,
+ wxSYS_COLOUR_HOTLIGHT,
+ wxSYS_COLOUR_GRADIENTACTIVECAPTION,
+ wxSYS_COLOUR_GRADIENTINACTIVECAPTION,
+ wxSYS_COLOUR_MENUHILIGHT,
+ wxSYS_COLOUR_MENUBAR,
+
+ wxSYS_COLOUR_MAX
+};
- wxSYS_COLOUR_DESKTOP,
- wxSYS_COLOUR_3DFACE,
- wxSYS_COLOUR_3DSHADOW,
- wxSYS_COLOUR_3DHIGHLIGHT,
- wxSYS_COLOUR_3DHILIGHT,
- wxSYS_COLOUR_BTNHILIGHT,
-
- wxSYS_MOUSE_BUTTONS,
+// possible values for wxSystemSettings::GetMetric() parameter
+//
+enum wxSystemMetric
+{
+ wxSYS_MOUSE_BUTTONS = 1,
wxSYS_BORDER_X,
wxSYS_BORDER_Y,
wxSYS_CURSOR_X,
wxSYS_NETWORK_PRESENT,
wxSYS_PENWINDOWS_PRESENT,
wxSYS_SHOW_SOUNDS,
- wxSYS_SWAP_BUTTONS,
+ wxSYS_SWAP_BUTTONS
};
+// possible values for wxSystemSettings::HasFeature() parameter
+enum wxSystemFeature
+{
+ wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
+ wxSYS_CAN_ICONIZE_FRAME
+};
+enum wxSystemScreenType
+{
+ wxSYS_SCREEN_NONE = 0, // not yet defined
-%inline %{
+ wxSYS_SCREEN_TINY, // <
+ wxSYS_SCREEN_PDA, // >= 320x240
+ wxSYS_SCREEN_SMALL, // >= 640x480
+ wxSYS_SCREEN_DESKTOP // >= 800x600
+};
- wxColour wxSystemSettings_GetSystemColour(int index) {
- return wxSystemSettings::GetSystemColour(index);
- }
- wxFont wxSystemSettings_GetSystemFont(int index) {
- return wxSystemSettings::GetSystemFont(index);
- }
+class wxSystemSettings {
+public:
+ // get a standard system colour
+ static wxColour GetColour(wxSystemColour index);
+
+ // get a standard system font
+ static wxFont GetFont(wxSystemFont index);
+
+ // get a system-dependent metric
+ static int GetMetric(wxSystemMetric index);
+
+ // return true if the port has certain feature
+ static bool HasFeature(wxSystemFeature index);
+
+ // Get system screen design (desktop, pda, ..) used for
+ // laying out various dialogs.
+ static wxSystemScreenType GetScreenType();
+
+ // Override default.
+ static void SetScreenType( wxSystemScreenType screen );
+
+};
+
- int wxSystemSettings_GetSystemMetric(int index) {
- return wxSystemSettings::GetSystemMetric(index);
- }
-%}
//---------------------------------------------------------------------------
// wxToolTip
//----------------------------------------------------------------------
-%{
-class wxPyFontEnumerator : public wxFontEnumerator {
-public:
- wxPyFontEnumerator() {}
- ~wxPyFontEnumerator() {}
-
- DEC_PYCALLBACK_BOOL_STRING(OnFacename);
- DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
-
- PYPRIVATE;
-};
-
-IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
-IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
-
-%}
-
-%name(wxFontEnumerator) class wxPyFontEnumerator {
-public:
- wxPyFontEnumerator();
- ~wxPyFontEnumerator();
- void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
- %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator, 0)"
-
- bool EnumerateFacenames(
- wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
- bool fixedWidthOnly = FALSE);
- bool EnumerateEncodings(const char* facename = "");
-
- //wxArrayString* GetEncodings();
- //wxArrayString* GetFacenames();
- %addmethods {
- PyObject* GetEncodings() {
- wxArrayString* arr = self->GetEncodings();
- return wxArrayString2PyList_helper(*arr);
- }
-
- PyObject* GetFacenames() {
- wxArrayString* arr = self->GetFacenames();
- return wxArrayString2PyList_helper(*arr);
- }
- }
-};
-
-//----------------------------------------------------------------------
-
class wxBusyCursor {
public:
wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);
class wxPyTipProvider : public wxTipProvider {
public:
wxPyTipProvider(size_t currentTip);
+
+ void _setCallbackInfo(PyObject* self, PyObject* _class);
+ %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyTipProvider)"
};
public:
// ctor starts the stop watch
wxStopWatch();
+ ~wxStopWatch();
void Start(long t = 0);
void Pause();
void Resume();
wxLOG_User = 100 // user defined levels start here
};
+#define wxTRACE_MemAlloc "memalloc" // trace memory allocation (new/delete)
+#define wxTRACE_Messages "messages" // trace window messages/X callbacks
+#define wxTRACE_ResAlloc "resalloc" // trace GDI resource allocation
+#define wxTRACE_RefCount "refcount" // trace various ref counting operations
+
+#ifdef __WXMSW__
+#define wxTRACE_OleCalls "ole" // OLE interface calls
+#endif
+
+enum {
+ wxTraceMemAlloc,
+ wxTraceMessages,
+ wxTraceResAlloc,
+ wxTraceRefCount,
+
+#ifdef __WXMSW__
+ wxTraceOleCalls,
+#endif
+};
+
+
class wxLog
{
static bool IsEnabled();
static bool EnableLogging(bool doIt = TRUE);
- static void OnLog(wxLogLevel level, const char *szString, int t=0);
+ static void OnLog(unsigned long level, const wxString& szString, int t=0);
virtual void Flush();
bool HasPendingMessages() const;
static void Suspend();
static void Resume();
- void SetVerbose(bool bVerbose = TRUE);
+ static void SetVerbose(bool bVerbose = TRUE);
static void DontCreateOnDemand();
- static void SetTraceMask(wxTraceMask ulMask);
+ static void SetTraceMask(long 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();
+ static void SetTimestamp(const wxString& ts);
+ static const wxString& GetTimestamp();
- bool GetVerbose() const { return m_bVerbose; }
+ bool GetVerbose() const;
- static wxTraceMask GetTraceMask();
- static bool IsAllowedTraceMask(const char *mask);
+ static unsigned long GetTraceMask();
+ static bool IsAllowedTraceMask(const wxString& mask);
// static void TimeStamp(wxString *str);
%addmethods {
return msg;
}
}
+
};
{
public:
wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL)
- const char *szTitle, // the title of the frame
+ const wxString& szTitle, // the title of the frame
bool bShow = TRUE, // show window immediately?
bool bPassToOld = TRUE); // pass log messages to the old target?
wxFrame *GetFrame() const;
wxLog *GetOldLog() const;
bool IsPassingMessages() const;
- void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; }
-};
-
-
-class wxLogNull
-{
-public:
- wxLogNull();
- ~wxLogNull();
+ void PassMessages(bool bDoPass);
};
unsigned long wxSysErrorCode();
-const char* wxSysErrorMsg(unsigned long nErrCode = 0);
-void wxLogFatalError(const char *szFormat);
-void wxLogError(const char *szFormat);
-void wxLogWarning(const char *szFormat);
-void wxLogMessage(const char *szFormat);
-void wxLogInfo(const char *szFormat);
-void wxLogVerbose(const char *szFormat);
-void wxLogStatus(const char *szFormat);
-%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const char *szFormat);
-void wxLogSysError(const char *szFormat);
+const wxString wxSysErrorMsg(unsigned long nErrCode = 0);
+void wxLogFatalError(const wxString& msg);
+void wxLogError(const wxString& msg);
+void wxLogWarning(const wxString& msg);
+void wxLogMessage(const wxString& msg);
+void wxLogInfo(const wxString& msg);
+void wxLogVerbose(const wxString& msg);
+void wxLogStatus(const wxString& msg);
+%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
+void wxLogSysError(const wxString& msg);
+
+void wxLogTrace(const wxString& msg);
+%name(wxLogTraceMask)void wxLogTrace(const wxString& mask, const wxString& msg);
+
+void wxLogGeneric(unsigned long level, const wxString& msg);
+
+// wxLogFatalError helper: show the (fatal) error to the user in a safe way,
+// i.e. without using wxMessageBox() for example because it could crash
+void wxSafeShowMessage(const wxString& title, const wxString& text);
+
+
+
+// Suspress logging while an instance of this class exists
+class wxLogNull
+{
+public:
+ wxLogNull();
+ ~wxLogNull();
+};
+
+
%{
-// A Log class that can be derived from in wxPython
+// A wxLog 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);
+ wxPyBeginBlockThreads();
+ if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) {
+ PyObject* s = wx2PyString(szString);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t));
+ Py_DECREF(s);
+ }
+ wxPyEndBlockThreads();
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);
+ wxPyBeginBlockThreads();
+ if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) {
+ PyObject* s = wx2PyString(szString);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t));
+ Py_DECREF(s);
+ }
+ wxPyEndBlockThreads();
if (! found)
wxLog::DoLogString(szString, t);
}
//----------------------------------------------------------------------
+enum wxKillError
+{
+ wxKILL_OK, // no error
+ wxKILL_BAD_SIGNAL, // no such signal
+ wxKILL_ACCESS_DENIED, // permission denied
+ wxKILL_NO_PROCESS, // no such process
+ wxKILL_ERROR // another, unspecified error
+};
+
+enum wxSignal
+{
+ wxSIGNONE = 0, // verify if the process exists under Unix
+ wxSIGHUP,
+ wxSIGINT,
+ wxSIGQUIT,
+ wxSIGILL,
+ wxSIGTRAP,
+ wxSIGABRT,
+ wxSIGIOT = wxSIGABRT, // another name
+ wxSIGEMT,
+ wxSIGFPE,
+ wxSIGKILL,
+ wxSIGBUS,
+ wxSIGSEGV,
+ wxSIGSYS,
+ wxSIGPIPE,
+ wxSIGALRM,
+ wxSIGTERM
+
+ // further signals are different in meaning between different Unix systems
+};
+
+
+
enum {
/* event type */
wxEVT_END_PROCESS
};
+
class wxProcessEvent : public wxEvent {
public:
wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0);
%name(wxProcess)class wxPyProcess : public wxEvtHandler {
public:
+ // kill the process with the given PID
+ static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM);
+
+ // test if the given process exists
+ static bool Exists(int pid);
+
+ // this function replaces the standard popen() one: it launches a process
+ // asynchronously and allows the caller to get the streams connected to its
+ // std{in|out|err}
+ //
+ // on error NULL is returned, in any case the process object will be
+ // deleted automatically when the process terminates and should *not* be
+ // deleted by the caller
+ static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
+
+
+
wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
%addmethods { void Destroy() { delete self; } }
};
+enum
+{
+ // execute the process asynchronously
+ wxEXEC_ASYNC = 0,
+
+ // execute it synchronously, i.e. wait until it finishes
+ wxEXEC_SYNC = 1,
+
+ // under Windows, don't hide the child even if it's IO is redirected (this
+ // is done by default)
+ wxEXEC_NOHIDE = 2,
+
+ // under Unix, if the process is the group leader then killing -pid kills
+ // all children as well as pid
+ wxEXEC_MAKE_GROUP_LEADER = 4
+};
+
long wxExecute(const wxString& command,
- int sync = FALSE,
+ int flags = wxEXEC_ASYNC,
wxPyProcess *process = NULL);
//----------------------------------------------------------------------
+
+// Which joystick? Same as Windows ids so no conversion necessary.
+enum
+{
+ wxJOYSTICK1,
+ wxJOYSTICK2
+};
+
+// Which button is down?
+enum
+{
+ wxJOY_BUTTON_ANY,
+ wxJOY_BUTTON1,
+ wxJOY_BUTTON2,
+ wxJOY_BUTTON3,
+ wxJOY_BUTTON4,
+};
+
+
%{
#if !wxUSE_JOYSTICK && !defined(__WXMSW__)
// A C++ stub class for wxJoystick for platforms that don't have it.
class wxJoystick : public wxObject {
public:
wxJoystick(int joystick = wxJOYSTICK1) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform.");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
}
wxPoint GetPosition() { return wxPoint(-1,-1); }
int GetZPosition() { return -1; }
{
public:
wxWave(const wxString& fileName, bool isResource = FALSE) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
}
wxWave(int size, const wxByte* data) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
}
~wxWave() {}
public:
// ctors
// a normal item
- wxFileTypeInfo(const char *mimeType,
- const char *openCmd,
- const char *printCmd,
- const char *desc);
+ 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
{
public:
// ctors
- MessageParameters(const wxString& filename=wxPyEmptyStr,
- const wxString& mimetype=wxPyEmptyStr);
+ MessageParameters(const wxString& filename=wxPyEmptyString,
+ const wxString& mimetype=wxPyEmptyString);
// accessors (called by GetOpenCommand)
// filename
%addmethods {
PyObject* GetMimeType() {
wxString str;
- if (self->GetMimeType(&str))
- return PyString_FromString(str.c_str());
+ if (self->GetMimeType(&str)) {
+#if wxUSE_UNICODE
+ return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+ return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+ }
else
RETURN_NONE();
}
wxString iconFile;
int iconIndex;
if (self->GetIcon(&icon, &iconFile, &iconIndex)) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ 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()));
+#if wxUSE_UNICODE
+ PyTuple_SetItem(tuple, 1, PyUnicode_FromUnicode(iconFile.c_str(), iconFile.Len()));
+#else
+ PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize(iconFile.c_str(), iconFile.Len()));
+#endif
PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return tuple;
}
else
// get a brief file type description ("*.txt" => "text document")
PyObject* GetDescription() {
wxString str;
- if (self->GetDescription(&str))
- return PyString_FromString(str.c_str());
- else
+ if (self->GetDescription(&str)) {
+#if wxUSE_UNICODE
+ return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+ return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+ } else
RETURN_NONE();
}
}
// get the command to open/execute the file of given type
%addmethods {
PyObject* GetOpenCommand(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxPyEmptyString) {
wxString str;
- if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
- return PyString_FromString(str.c_str());
- else
+ if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
+#if wxUSE_UNICODE
+ return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+ return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+ } else
RETURN_NONE();
}
}
// get the command to print the file of given type
%addmethods {
PyObject* GetPrintCommand(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxPyEmptyString) {
wxString str;
- if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
- return PyString_FromString(str.c_str());
- else
+ if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
+#if wxUSE_UNICODE
+ return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+ return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+ } else
RETURN_NONE();
}
}
// Get all commands defined for this file type
%addmethods {
PyObject* GetAllCommands(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxPyEmptyString) {
wxArrayString verbs;
wxArrayString commands;
if (self->GetAllCommands(&verbs, &commands,
wxFileType::MessageParameters(filename, mimetype))) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(2);
PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return tuple;
}
else
bool SetCommand(const wxString& cmd, const wxString& verb,
bool overwriteprompt = TRUE);
- bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
+ bool SetDefaultIcon(const wxString& cmd = wxPyEmptyString, int index = 0);
// remove the association for this filetype from the system MIME database:
// use the extraDir parameter if you want to look for files in another
// directory
void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
- const wxString& extraDir = wxEmptyString);
+ const wxString& extraDir = wxPyEmptyString);
// and this function clears all the data from the manager
void ClearData();
%}
%readwrite
+//----------------------------------------------------------------------
+
+%{
+#include <wx/artprov.h>
+
+ DECLARE_DEF_STRING(ART_OTHER);
+
+%}
+
+// Art clients
+#define wxART_TOOLBAR "toolbar_C"
+#define wxART_MENU "menu_C"
+#define wxART_FRAME_ICON "frame_icon_C"
+
+#define wxART_CMN_DIALOG "cmn_dialog_C"
+#define wxART_HELP_BROWSER "help_browser_C"
+#define wxART_MESSAGE_BOX "message_box_C"
+
+#define wxART_OTHER "other_C"
+
+// Art IDs
+#define wxART_ADD_BOOKMARK "add_bookmark"
+#define wxART_DEL_BOOKMARK "del_bookmark"
+#define wxART_HELP_SIDE_PANEL "help_side_panel"
+#define wxART_HELP_SETTINGS "help_settings"
+#define wxART_HELP_BOOK "help_book"
+#define wxART_HELP_FOLDER "help_folder"
+#define wxART_HELP_PAGE "help_page"
+#define wxART_GO_BACK "go_back"
+#define wxART_GO_FORWARD "go_forward"
+#define wxART_GO_UP "go_up"
+#define wxART_GO_DOWN "go_down"
+#define wxART_GO_TO_PARENT "go_to_parent"
+#define wxART_GO_HOME "go_home"
+#define wxART_FILE_OPEN "file_open"
+#define wxART_PRINT "print"
+#define wxART_HELP "help"
+#define wxART_TIP "tip"
+#define wxART_REPORT_VIEW "report_view"
+#define wxART_LIST_VIEW "list_view"
+#define wxART_NEW_DIR "new_dir"
+#define wxART_FOLDER "folder"
+#define wxART_GO_DIR_UP "go_dir_up"
+#define wxART_EXECUTABLE_FILE "executable_file"
+#define wxART_NORMAL_FILE "normal_file"
+#define wxART_TICK_MARK "tick"
+#define wxART_CROSS_MARK "cross"
+#define wxART_ERROR "error"
+#define wxART_QUESTION "question"
+#define wxART_WARNING "warning"
+#define wxART_INFORMATION "information"
+
+
+%{ // Python aware wxArtProvider
+class wxPyArtProvider : public wxArtProvider {
+public:
+
+ virtual wxBitmap CreateBitmap(const wxArtID& id,
+ const wxArtClient& client,
+ const wxSize& size) {
+ wxBitmap rval = wxNullBitmap;
+ wxPyBeginBlockThreads();
+ if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {
+ PyObject* so = wxPyConstructObject((void*)&size, "wxSize", 0);
+ PyObject* ro;
+ wxBitmap* ptr;
+ PyObject* s1, *s2;
+ s1 = wx2PyString(id);
+ s2 = wx2PyString(client);
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOO)", s1, s2, so));
+ Py_DECREF(so);
+ Py_DECREF(s1);
+ Py_DECREF(s2);
+ if (ro) {
+ if (!SWIG_GetPtrObj(ro, (void**)&ptr, "_wxBitmap_p"))
+ rval = *ptr;
+ Py_DECREF(ro);
+ }
+ }
+ wxPyEndBlockThreads();
+ return rval;
+ }
+
+ PYPRIVATE;
+};
+%}
+
+// The one for SWIG to see
+%name(wxArtProvider) class wxPyArtProvider : public wxObject
+{
+public:
+ wxPyArtProvider();
+
+ void _setCallbackInfo(PyObject* self, PyObject* _class);
+ %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxArtProvider)"
+
+ // Add new provider to the top of providers stack.
+ static void PushProvider(wxPyArtProvider *provider);
+
+ // Remove latest added provider and delete it.
+ static bool PopProvider();
+
+ // Remove provider. The provider must have been added previously!
+ // The provider is _not_ deleted.
+ static bool RemoveProvider(wxPyArtProvider *provider);
+
+ // Query the providers for bitmap with given ID and return it. Return
+ // wxNullBitmap if no provider provides it.
+ static wxBitmap GetBitmap(const wxString& id,
+ const wxString& client = wxPyART_OTHER,
+ const wxSize& size = wxDefaultSize);
+
+ // Query the providers for icon with given ID and return it. Return
+ // wxNullIcon if no provider provides it.
+ static wxIcon GetIcon(const wxString& id,
+ const wxString& client = wxPyART_OTHER,
+ const wxSize& size = wxDefaultSize);
+
+ // Destroy caches & all providers
+ static void CleanUpProviders();
+};
+
+
//----------------------------------------------------------------------
%{
void Save(wxConfigBase& config);
void AddFilesToMenu();
- %name(AddFilesToSingleMenu)void AddFilesToMenu(wxMenu* menu);
+ %name(AddFilesToThisMenu)void AddFilesToMenu(wxMenu* menu);
// Accessors
wxString GetHistoryFile(int i) const;
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+// %{
+// #if wxUSE_UNICODE
+// #define ADD_STRING(dict, str) \
+// wxString tmp##str(str); \
+// PyDict_SetItemString(dict, #str, \
+// PyUnicode_FromUnicode(tmp##str.c_str(), tmp##str.Len()))
+// #else
+// #define ADD_STRING(dict, str) \
+// PyDict_SetItemString(d, #str, PyString_FromString(str))
+// #endif
+// %}
+
%init %{
- wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
+ wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
+
%}
//----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff