bitwise vs. logical operator

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

diff --git a/wxPython/src/_gauge.i b/wxPython/src/_gauge.i
index 9171ca3dcff40105980e1a444a4cbde9bad2eec3..6c5c16c5b615e2d7f20d094c361373b9b7d1e014 100644 (file)
--- a/wxPython/src/_gauge.i
+++ b/wxPython/src/_gauge.i
@@ -23,26 +23,28 @@ enum {
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
     wxGA_SMOOTH,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
     wxGA_SMOOTH,

-    wxGA_PROGRESSBAR   // obsolete

 };
 };

+%pythoncode { GA_PROGRESSBAR = 0 %# obsolete }

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

+MustHaveApp(wxGauge);
+

 class wxGauge : public wxControl {
 public:
 class wxGauge : public wxControl {
 public:

-    %addtofunc wxGauge         "self._setOORInfo(self)"
-    %addtofunc wxGauge()       ""
+    %pythonAppend wxGauge         "self._setOORInfo(self)"
+    %pythonAppend wxGauge()       ""

 
 

-    wxGauge(wxWindow* parent, wxWindowID id, int range,
+    wxGauge(wxWindow* parent, wxWindowID id=-1, int range=100,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxPyGaugeNameStr);
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxPyGaugeNameStr);

-    %name(PreGauge)wxGauge();
+    %RenameCtor(PreGauge, wxGauge());

 
 

-    bool Create(wxWindow* parent, wxWindowID id, int range,
+    bool Create(wxWindow* parent, wxWindowID id=-1, int range=100,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxGA_HORIZONTAL,


@@ -57,6 +59,9 @@ public:
     virtual void SetValue(int pos);
     virtual int GetValue() const;
 
     virtual void SetValue(int pos);
     virtual int GetValue() const;
 

+    // indeterminate mode API
+    virtual void Pulse();
+

     // simple accessors
     bool IsVertical() const;
 
     // simple accessors
     bool IsVertical() const;
 


@@ -65,6 +70,16 @@ public:
     virtual int GetShadowWidth() const;
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;
     virtual int GetShadowWidth() const;
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;

+
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    %property(BezelFace, GetBezelFace, SetBezelFace, doc="See `GetBezelFace` and `SetBezelFace`");
+    %property(Range, GetRange, SetRange, doc="See `GetRange` and `SetRange`");
+    %property(ShadowWidth, GetShadowWidth, SetShadowWidth, doc="See `GetShadowWidth` and `SetShadowWidth`");
+    %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`");
+   

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------