fixed gcc warnings and reformatted some pieces of code to be a bit readable

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index abf8a1f7e0bfd87f4e0756e62d285c0a75e56e11..925cca91dd7ebca48cc2a9a3ee5a8ff8042d946b 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -1,19 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gauge.h
+// Purpose:     wxGauge interface
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.02.01
+// RCS-ID:      $Id$
+// Copyright:   (c) 1996-2001 wxWindows team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/gauge.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "gaugebase.h"
+#endif
+
+#include "wx/defs.h"
+
+#if wxUSE_GAUGE
+
+#include "wx/control.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+
+// ----------------------------------------------------------------------------
+// wxGauge: a progress bar
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGaugeBase : public wxControl
+{
+public:
+    wxGaugeBase() { }
+    virtual ~wxGaugeBase();
+
+    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);
+
+    // set/get the control range
+    virtual void SetRange(int range);
+    virtual int GetRange() const;
+
+    // position
+    virtual void SetValue(int pos);
+    virtual int GetValue() const;
+
+    // appearance params (not implemented for most ports)
+
+    virtual void SetShadowWidth(int w);
+    virtual int GetShadowWidth() const;
+
+    virtual void SetBezelFace(int w);
+    virtual int GetBezelFace() const;
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+protected:
+    // the max position
+    int m_rangeMax;
+
+    // the current position
+    int m_gaugePos;
+
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)
+};
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/gauge.h"
+#elif defined(__WXMSW__)
+    #ifdef __WIN95__
+        #include "wx/msw/gauge95.h"
+        #define wxGauge wxGauge95
+        #define sm_classwxGauge sm_classwxGauge95
+    #else // !__WIN95__
+        // Gauge no longer supported on 16-bit Windows
+    #endif
 #elif defined(__WXMOTIF__)
-#include "wx/motif/gauge.h"
+    #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/gauge.h"
-#elif defined(__WXQT__)
-#include "wx/qt/gauge.h"
+    #include "wx/gtk/gauge.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/gauge.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/gauge.h"
+    #include "wx/mac/gauge.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/gauge.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/gauge.h"
 #endif
 
+#endif // wxUSE_GAUGE
+
 #endif
     // _WX_GAUGE_H_BASE_