deprecated wxSizerItem::IsShown() because it doesn't really make sense for the sizers

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 2f9fd14475958c47d9b9cf5e575593887c77e445..3f4a0c88bc115e80ff337d5f37ce29e34b8c699c 100644 (file)
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -129,7 +129,8 @@ enum wxSystemMetric
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
 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
 {
 
 class wxSystemSettings
 {


@@ -159,9 +166,9 @@ 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
+    // return True if the port has certain feature

     static bool HasFeature(wxSystemFeature index);
 
 
     static bool HasFeature(wxSystemFeature index);
 
 


@@ -174,22 +181,26 @@ public:
 
 };
 
 
 };
 

+

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

+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);

 };
 
 
 };