wxMGL compilation fixes

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

diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index ff8dfa00ad1084ae15c2fb78749b1d4b1054bc0a..b5f5dd4cd34a46e5192d4d874c1e98ac38fbeaf7 100644 (file)
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -12,63 +12,51 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 

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

 #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)
- public:
-  inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
-
-  inline wxGauge(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)
-  {
-    Create(parent, id, range, pos, size, style, validator, name);
-  }
-
-  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);
-
-  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 ;
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-
-  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;
+    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,
+        const wxSize& size = wxDefaultSize,
+        long style = wxGA_HORIZONTAL,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxGaugeNameStr)
+    {
+        Create(parent, id, range, pos, size, style, validator, name);
+    }
+    
+    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);
+    
+    void SetShadowWidth(int w);
+    void SetRange(int r);
+    void SetValue(int pos);
+    
+    int GetShadowWidth() const ;
+    int GetRange() const ;
+    int GetValue() const ;
+    
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+
+private:
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);

 };
 
 #endif
 };
 
 #endif

-    // _WX_GAUGE_H_
+// _WX_GAUGE_H_