X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/gtk1/gauge.h?ds=sidebyside

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 51e9563b56..41531b05d1 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -1,83 +1,81 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/gtk1/gauge.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxGauge;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char* wxGaugeNameStr;
-
 //-----------------------------------------------------------------------------
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 
-class wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
-    inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
-
-    inline wxGauge( wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr )
+public:
+    wxGauge() { Init(); }
+
+    wxGauge( wxWindow *parent,
+             wxWindowID id,
+             int range,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxGA_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxGaugeNameStr )
     {
-      Create(parent, id, range, pos, size, style, validator, name);
+        Init();
+
+        Create(parent, id, range, pos, size, style, validator, name);
     }
-    bool Create( wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr );
-    void SetShadowWidth( int WXUNUSED(w) ) {};
-    void SetBezelFace( int WXUNUSED(w) ) {};
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id, int range,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxGA_HORIZONTAL,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxGaugeNameStr );
+
+    void SetShadowWidth( int WXUNUSED(w) ) { }
+    void SetBezelFace( int WXUNUSED(w) ) { }
     void SetRange( int r );
     void SetValue( int pos );
-    int GetShadowWidth(void) const { return 0; };
-    int GetBezelFace(void) const { return 0; };
-    int GetRange(void) const;
-    int GetValue(void) const;
-
-    // Are we a Win95/GTK progress bar, or a normal gauge?
-    inline bool GetProgressBar(void) const { return m_useProgressBar; }
-
- protected:
- 
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    int GetShadowWidth() const { return 0; }
+    int GetBezelFace() const { return 0; }
+    int GetRange() const;
+    int GetValue() const;
+
+    bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // implementation
+    // -------------
+
+    // the max and current gauge values
+    int m_rangeMax,
+        m_gaugePos;
+
+protected:
+    // common part of all ctors
+    void Init() { m_rangeMax = m_gaugePos = 0; }
+
+    // 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 // __GTKGAUGEH__
+#endif
+    // __GTKGAUGEH__