Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 46f9cad23bb709e6fd9fbdd0ec54a886fd43182e..2d8aa5c8d9b5924cd714b931567b930c00e8fe25 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -1,45 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

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

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

-

 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGauge;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
-

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

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

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


@@ -70,16 +44,16 @@ public:
     void SetBezelFace( int WXUNUSED(w) ) { }
     void SetRange( int r );
     void SetValue( int pos );
     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; }

     int GetRange() const;
     int GetValue() const;
 
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
     int GetRange() const;
     int GetValue() const;
 
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }

-    
+

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

-    
+

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


@@ -87,11 +61,6 @@ public:
     int m_rangeMax,
         m_gaugePos;
 
     int m_rangeMax,
         m_gaugePos;
 

-    // obsolete functions, don't use
-#if 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; }


@@ -108,5 +77,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-
-#endif // __GTKGAUGEH__
+    // __GTKGAUGEH__