Added wx.ArtProvider.GetSize

[wxWidgets.git] / wxPython / src / _settings.i

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 28ba50b29030087547d4bfc13b352f23740a1270..b4bc618260cb6060abcd62ab7357f9281908caa6 100644 (file)
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -148,6 +148,12 @@ enum wxSystemScreenType
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxSystemSettings::GetColour);
+MustHaveApp(wxSystemSettings::GetFont);
+MustHaveApp(wxSystemSettings::GetMetric);
+MustHaveApp(wxSystemSettings::HasFeature);
+MustHaveApp(wxSystemSettings::GetScreenType);
+MustHaveApp(wxSystemSettings::SetScreenType);

 
 class wxSystemSettings
 {
 
 class wxSystemSettings
 {


@@ -175,27 +181,21 @@ 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:
 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);
 
     // 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 wxString GetOption(const wxString& name) ;
     static int GetOptionInt(const wxString& name) ;
     static bool HasOption(const wxString& name) ;