set/get validator for wxTextCtrl part of wxComboCtrl and not the combo itself (patch...

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index c1d22c1a988e8b9da3e3b0b0ceca3fca0733744c..b06d3bf7f87496b3d23cf14423c5b46e8573105f 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -1,45 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxGauge;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar* wxGaugeNameStr;
+#ifndef _WX_GTK_GAUGE_H_
+#define _WX_GTK_GAUGE_H_

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

-// wxGaugeBox
+// wxGauge

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

-class wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxControl

 {
 public:
     wxGauge() { Init(); }
 {
 public:
     wxGauge() { Init(); }


@@ -68,27 +43,33 @@ 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); }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    virtual wxVisualAttributes GetDefaultAttributes() const;
+

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

-    void ApplyWidgetStyle();
-

     // the max and current gauge values
     int m_rangeMax,
         m_gaugePos;
 
     // the max and current gauge values
     int m_rangeMax,
         m_gaugePos;
 

-    // obsolete functions, don't use
-#ifdef WXWIN_COMPATIBILITY_2_2
-    bool GetProgressBar() const { return TRUE; }
-#endif // WXWIN_COMPATIBILITY_2_2
-

 protected:
     // common part of all ctors
     void Init() { m_rangeMax = m_gaugePos = 0; }
 protected:
     // common part of all ctors
     void Init() { m_rangeMax = m_gaugePos = 0; }


@@ -96,10 +77,11 @@ protected:
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 

+    virtual wxSize DoGetBestSize() const;
+

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

-
-#endif // __GTKGAUGEH__
+    // _WX_GTK_GAUGE_H_