X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15648073358dd875cc5fc28a13da50aee173b69d..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_functions.i diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i index 232b762737..7b5d74e133 100644 --- a/wxPython/src/_functions.i +++ b/wxPython/src/_functions.i @@ -38,12 +38,31 @@ bool wxIsStockID(wxWindowID id); // given ID bool wxIsStockLabel(wxWindowID id, const wxString& label); +enum wxStockLabelQueryFlag +{ + wxSTOCK_NOFLAGS = 0, + + wxSTOCK_WITH_MNEMONIC = 1, + wxSTOCK_WITH_ACCELERATOR = 2 +}; + // Returns label that should be used for given stock UI element (e.g. "&OK" // for wxID_OK): wxString wxGetStockLabel(wxWindowID id, - bool withCodes = true, - wxString accelerator = wxPyEmptyString); - + long flags = wxSTOCK_WITH_MNEMONIC); + + +enum wxStockHelpStringClient +{ + wxSTOCK_MENU // help string to use for menu items +}; + +// Returns an help string for the given stock UI element and for the given "context". +wxString wxGetStockHelpString(wxWindowID id, + wxStockHelpStringClient client = wxSTOCK_MENU); + + + MustHaveApp(wxBell); void wxBell(); @@ -59,12 +78,21 @@ wxString wxNow(); bool wxShell(const wxString& command = wxPyEmptyString); void wxStartTimer(); + DocDeclA( int, wxGetOsVersion(int *OUTPUT, int *OUTPUT), "GetOsVersion() -> (platform, major, minor)"); wxString wxGetOsDescription(); + +// Get platform endianness +bool wxIsPlatformLittleEndian(); + +// Get platform architecture +bool wxIsPlatform64Bit(); + + // TODO: // // Parses the wildCard, returning the number of filters. // // Returns 0 if none or if there's a problem, @@ -73,6 +101,15 @@ wxString wxGetOsDescription(); // // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png" // int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters); + +%typemap(out) wxMemorySize { + %#if wxUSE_LONGLONG + $result = PyLong_FromLongLong($1.GetValue()); + %#else + $result = PyInt_FromLong($1); + %#endif +} + #if defined(__WXMSW__) || defined(__WXMAC__) wxMemorySize wxGetFreeMemory(); #else @@ -200,8 +237,6 @@ int wxMessageBox(const wxString& message, wxWindow *parent = NULL, int x = -1, int y = -1); -// WXWIN_COMPATIBILITY_2_4 -#if 0 MustHaveApp(wxGetNumberFromUser); long wxGetNumberFromUser(const wxString& message, const wxString& prompt, @@ -210,8 +245,6 @@ long wxGetNumberFromUser(const wxString& message, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition); -%pythoncode { GetNumberFromUser = wx._deprecated(GetNumberFromUser) } -#endif // GDI Functions @@ -427,40 +460,5 @@ MustHaveApp(wxThread); } %} -//--------------------------------------------------------------------------- - -// enum wxPowerType -// { -// wxPOWER_SOCKET, -// wxPOWER_BATTERY, -// wxPOWER_UNKNOWN -// }; - -// DocDeclStr( -// wxPowerType , wxGetPowerType(), -// "Returns the type of power source as one of wx.POWER_SOCKET, -// wx.POWER_BATTERY or wx.POWER_UNKNOWN. wx.POWER_UNKNOWN is also the -// default on platforms where this feature is not implemented.", ""); - - -// enum wxBatteryState -// { -// wxBATTERY_NORMAL_STATE, // system is fully usable -// wxBATTERY_LOW_STATE, // start to worry -// wxBATTERY_CRITICAL_STATE, // save quickly -// wxBATTERY_SHUTDOWN_STATE, // too late -// wxBATTERY_UNKNOWN_STATE -// }; - -// DocDeclStr( -// wxBatteryState , wxGetBatteryState(), -// "Returns battery state as one of wx.BATTERY_NORMAL_STATE, -// wx.BATTERY_LOW_STATE}, wx.BATTERY_CRITICAL_STATE, -// wx.BATTERY_SHUTDOWN_STATE or wx.BATTERY_UNKNOWN_STATE. -// wx.BATTERY_UNKNOWN_STATE is also the default on platforms where this -// feature is not implemented.", ""); - - - //--------------------------------------------------------------------------- //---------------------------------------------------------------------------