#4479: wx.ComboBox needs a SetFont method

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

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

-// Name:        gauge.h
+// Name:        wx/gtk1/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__
 
 #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;
-

 //-----------------------------------------------------------------------------
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 

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

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


@@ -75,20 +50,18 @@ public:
     int GetRange() const;
     int GetValue() const;
 
     int GetRange() const;
     int GetValue() const;
 

+    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // 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 +69,13 @@ 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;
+
+    virtual wxVisualAttributes GetDefaultAttributes() const;
+

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

-
-#endif // __GTKGAUGEH__
+    // __GTKGAUGEH__