Squash exception on exit bug

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 379a988facb29ab35a4ccc37cd1046d2fa52ed14..589efa1c6ac33a1fd73411171305baadccc63ea6 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
 {


@@ -159,7 +165,7 @@ public:
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric
     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);
 
     // return True if the port has certain feature
     static bool HasFeature(wxSystemFeature index);


@@ -175,30 +181,25 @@ 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) ;

+    static bool IsFalse(const wxString& name);

 };
 
 
 };