Some of these are not in BASE, cahnge back to WXDLLEXPORT

[wxWidgets.git] / include / wx / msw / gauge95.h

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 2681094ee9b4debcd34f3baed739f7b58e8bbd03..6173f606153030a1584777405968643b6ee91ea9 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -12,67 +12,52 @@
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 

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

 #pragma interface "gauge95.h"
 #endif
 
 #pragma interface "gauge95.h"
 #endif
 

-#if wxUSE_SLIDER
-
-#include "wx/control.h"
+#if wxUSE_GAUGE

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box

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

 {
 public:
 {
 public:

-    wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
-
-    wxGauge95(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)
+    wxGauge95() { }
+
+    wxGauge95(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);
+        (void)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(void) const ;
-    int GetBezelFace(void) const ;
-    int GetRange(void) const ;
-    int GetValue(void) const ;
+    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);

 
 

-    bool SetForegroundColour(const wxColour& col);
-    bool SetBackgroundColour(const wxColour& col);
+    // set gauge range/value
+    virtual void SetRange(int range);
+    virtual void SetValue(int pos);

 
     // overriden base class virtuals
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
-
-    // Backward compatibility
-#if WXWIN_COMPATIBILITY
-    void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
-#endif
-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+    virtual bool SetForegroundColour(const wxColour& col);
+    virtual bool SetBackgroundColour(const wxColour& col);

 
 protected:
 
 protected:

-    int      m_rangeMax;
-    int      m_gaugePos;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual wxSize DoGetBestSize() const;

 
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)