X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf763f5b942d40121b1d647d2a34d48410965c09..9ac884500ce30c58e24b0a6af1288b576d2e03e4:/wxPython/src/_settings.i?ds=sidebyside diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i index 379a988fac..f45d1fe3b9 100644 --- a/wxPython/src/_settings.i +++ b/wxPython/src/_settings.i @@ -129,7 +129,8 @@ enum wxSystemMetric enum wxSystemFeature { wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1, - wxSYS_CAN_ICONIZE_FRAME + wxSYS_CAN_ICONIZE_FRAME, + wxSYS_TABLET_PRESENT }; @@ -148,6 +149,12 @@ enum wxSystemScreenType //--------------------------------------------------------------------------- +MustHaveApp(wxSystemSettings::GetColour); +MustHaveApp(wxSystemSettings::GetFont); +MustHaveApp(wxSystemSettings::GetMetric); +MustHaveApp(wxSystemSettings::HasFeature); +MustHaveApp(wxSystemSettings::GetScreenType); +MustHaveApp(wxSystemSettings::SetScreenType); class wxSystemSettings { @@ -159,7 +166,7 @@ public: static wxFont GetFont(wxSystemFont index); // get a system-dependent metric - static int GetMetric(wxSystemMetric index); + static int GetMetric(wxSystemMetric index, wxWindow* win=NULL); // return True if the port has certain feature static bool HasFeature(wxSystemFeature index); @@ -175,32 +182,33 @@ public: }; -// %pythoncode { -// %# backwards compatibility aliasses -// SystemSettings_GetSystemColour = SystemSettings_GetColour -// SystemSettings_GetSystemFont = SystemSettings_GetFont -// SystemSettings_GetSystemMetric = SystemSettings_GetMetric -// } - - //--------------------------------------------------------------------------- +MAKE_CONST_WXSTRING(WINDOW_DEFAULT_VARIANT); + class wxSystemOptions : public wxObject { public: - wxSystemOptions() { } + wxSystemOptions(); // User-customizable hints to wxWindows or associated libraries // These could also be used to influence GetSystem... calls, indeed // to implement SetSystemColour/Font/Metric static void SetOption(const wxString& name, const wxString& value); - %name(SetOptionInt) static void SetOption(const wxString& name, int value); + %Rename(SetOptionInt, static void, SetOption(const wxString& name, int value)); static wxString GetOption(const wxString& name) ; static int GetOptionInt(const wxString& name) ; static bool HasOption(const wxString& name) ; + static bool IsFalse(const wxString& name); }; +%pythoncode { + %# Until the new native control for wxMac is up to par, still use the generic one. + SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) +} + + //---------------------------------------------------------------------------