wxUSE_STL/wxArrayString fixes.

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 379a988facb29ab35a4ccc37cd1046d2fa52ed14..38720a9537716c808b1fa8eb0db52da689a5fb48 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,20 +181,12 @@ public:
 };
 
 
 };
 
 

-// %pythoncode {
-// %# backwards compatibility aliasses
-// SystemSettings_GetSystemColour = SystemSettings_GetColour
-// SystemSettings_GetSystemFont   = SystemSettings_GetFont
-// SystemSettings_GetSystemMetric = SystemSettings_GetMetric
-// }    
-
-

 //---------------------------------------------------------------------------
 
 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
 
     // User-customizable hints to wxWindows or associated libraries
     // These could also be used to influence GetSystem... calls, indeed