%{
#include "helpers.h"
+#include "pyistream.h"
#include <wx/resource.h>
#include <wx/tooltip.h>
#include <wx/caret.h>
%import streams.i
%import utils.i
-%{
- static wxString wxPyEmptyStr("");
-%}
//---------------------------------------------------------------------------
// Dialog Functions
int x = -1, int y = -1);
wxString wxGetTextFromUser(const wxString& message,
- const wxString& caption = wxPyEmptyStr,
- const wxString& default_value = wxPyEmptyStr,
+ const wxString& caption = wxEmptyString,
+ const wxString& default_value = wxEmptyString,
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 = wxEmptyString,
+ const wxString& default_value = wxEmptyString,
wxWindow *parent = NULL);
int wxMessageBox(const wxString& message,
- const wxString& caption = wxPyEmptyStr,
+ const wxString& caption = wxEmptyString,
int style = wxOK | wxCENTRE,
wxWindow *parent = NULL,
int x = -1, int y = -1);
//---------------------------------------------------------------------------
// 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
+};
-%inline %{
- wxColour wxSystemSettings_GetSystemColour(int index) {
- return wxSystemSettings::GetSystemColour(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);
+
+};
- wxFont wxSystemSettings_GetSystemFont(int index) {
- return wxSystemSettings::GetSystemFont(index);
- }
- int wxSystemSettings_GetSystemMetric(int index) {
- return wxSystemSettings::GetSystemMetric(index);
- }
-%}
//---------------------------------------------------------------------------
// wxToolTip
public:
// ctor starts the stop watch
wxStopWatch();
+ ~wxStopWatch();
void Start(long t = 0);
void Pause();
void Resume();
virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
bool found;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(isi)", level, szString, t));
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
if (! found)
wxLog::DoLog(level, szString, t);
}
virtual void DoLogString(const wxChar *szString, time_t t) {
bool found;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(si)", szString, t));
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
if (! found)
wxLog::DoLogString(szString, t);
}
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
- MessageParameters(const wxString& filename=wxPyEmptyStr,
- const wxString& mimetype=wxPyEmptyStr);
+ MessageParameters(const wxString& filename=wxEmptyString,
+ const wxString& mimetype=wxEmptyString);
// accessors (called by GetOpenCommand)
// filename
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()));
PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return tuple;
}
else
// get the command to open/execute the file of given type
%addmethods {
PyObject* GetOpenCommand(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxEmptyString) {
wxString str;
if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
return PyString_FromString(str.c_str());
// get the command to print the file of given type
%addmethods {
PyObject* GetPrintCommand(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxEmptyString) {
wxString str;
if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
return PyString_FromString(str.c_str());
// Get all commands defined for this file type
%addmethods {
PyObject* GetAllCommands(const wxString& filename,
- const wxString& mimetype=wxPyEmptyStr) {
+ const wxString& mimetype=wxEmptyString) {
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
projects / wxWidgets.git / blobdiff