X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/motif/gauge.h?ds=sidebyside

diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index d8c6e2edb3..3183875824 100644
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -1,33 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/motif/gauge.h
 // Purpose:     wxGauge class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
-#ifdef __GNUG__
-#pragma interface "gauge.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-
 // Group box
-class WXDLLEXPORT wxGauge : public wxControl
+class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
-        
+
 public:
     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
-    
+
     inline wxGauge(wxWindow *parent, wxWindowID id,
         int range,
         const wxPoint& pos = wxDefaultPosition,
@@ -38,7 +30,7 @@ public:
     {
         Create(parent, id, range, pos, size, style, validator, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id,
         int range,
         const wxPoint& pos = wxDefaultPosition,
@@ -46,27 +38,20 @@ public:
         long style = wxGA_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxGaugeNameStr);
-    
+
     void SetShadowWidth(int w);
-    void SetBezelFace(int w);
     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)) {} ;
-    
-    // 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