added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/mac/gauge.h b/include/wx/mac/gauge.h
index ce19d9ef1fb20d29e9fca2bd29477fc5985d642a..1a72c563bc4823e51c500256a166fd9121b889c3 100644 (file)
--- a/include/wx/mac/gauge.h
+++ b/include/wx/mac/gauge.h
@@ -1,27 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
 // Purpose:     wxGauge class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.h
 // Purpose:     wxGauge class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "gauge.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "gauge.h"
 #endif
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;

 
 // Group box
 
 // Group box

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

 {
   DECLARE_DYNAMIC_CLASS(wxGauge)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxGauge)
  public:


@@ -56,8 +56,6 @@ class WXDLLEXPORT wxGauge: public wxControl
   int GetRange() const ;
   int GetValue() const ;
 
   int GetRange() const ;
   int GetValue() const ;
 

-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-

   virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
  protected:
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
  protected: