GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index d8c6e2edb32c3379ba934464868ba3dd16aab189..be736436b9fad346ae74d8d2c8d126e304264a8a 100644 (file)
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -12,16 +12,12 @@
 #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
 
 #pragma interface "gauge.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-

 // Group box
 // Group box

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

 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
         
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
         


@@ -48,25 +44,18 @@ public:
         const wxString& name = wxGaugeNameStr);
     
     void SetShadowWidth(int w);
         const wxString& name = wxGaugeNameStr);
     
     void SetShadowWidth(int w);

-    void SetBezelFace(int w);

     void SetRange(int r);
     void SetValue(int pos);
     
     int GetShadowWidth() const ;
     void SetRange(int r);
     void SetValue(int pos);
     
     int GetShadowWidth() const ;

-    int GetBezelFace() const ;

     int GetRange() const ;
     int GetValue() const ;
     
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
     int GetRange() const ;
     int GetValue() const ;
     
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;

-    
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    
-protected:
-    int      m_rangeMax;
-    int      m_gaugePos;
+
+private:
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);

 };
 
 #endif
 };
 
 #endif