bitwise vs. logical operator

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 38720a9537716c808b1fa8eb0db52da689a5fb48..18e01bd70b3e21740dc2e68f0fa36d4cd7d5114c 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 

 };
 
 
 };
 
 


@@ -165,7 +166,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);


@@ -183,6 +184,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MAKE_CONST_WXSTRING(WINDOW_DEFAULT_VARIANT);
+

 class wxSystemOptions : public wxObject
 {
 public:
 class wxSystemOptions : public wxObject
 {
 public:


@@ -193,12 +196,12 @@ public:
     // to implement SetSystemColour/Font/Metric
 
     static void SetOption(const wxString& name, const wxString& value);
     // 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);

 };
 
 
 };
 
 

-

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