rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

[wxWidgets.git] / include / wx / gtk / gauge.h

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 6b967c3bc8f844a46fd765e025e5546b9897b268..b06d3bf7f87496b3d23cf14423c5b46e8573105f 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -1,37 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge.h
+// Name:        wx/gtk/gauge.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKGAUGEH__
-#define __GTKGAUGEH__
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGauge;
+#ifndef _WX_GTK_GAUGE_H_
+#define _WX_GTK_GAUGE_H_

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

-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
-
-//-----------------------------------------------------------------------------
-// wxGaugeBox
+// wxGauge

 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxGauge: public wxControl
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxGauge: public wxControl


@@ -63,18 +43,26 @@ public:
 
     void SetShadowWidth( int WXUNUSED(w) ) { }
     void SetBezelFace( int WXUNUSED(w) ) { }
 
     void SetShadowWidth( int WXUNUSED(w) ) { }
     void SetBezelFace( int WXUNUSED(w) ) { }

-    void SetRange( int r );
-    void SetValue( int pos );

     int GetShadowWidth() const { return 0; };
     int GetBezelFace() const { return 0; };
     int GetShadowWidth() const { return 0; };
     int GetBezelFace() const { return 0; };

+
+    // determinate mode API
+    void SetRange( int r );
+    void SetValue( int pos );
+

     int GetRange() const;
     int GetValue() const;
 
     int GetRange() const;
     int GetValue() const;
 

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

     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }

-    
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+
+    virtual wxVisualAttributes GetDefaultAttributes() const;
+

     // implementation
     // -------------
 
     // implementation
     // -------------
 


@@ -91,12 +79,9 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

-    virtual wxVisualAttributes GetDefaultAttributes() const;
-

 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
 #endif
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
 #endif

-
-#endif // __GTKGAUGEH__
+    // _WX_GTK_GAUGE_H_