Added wxPaintDCEx class, to handle the case where an HDC

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

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 5346750970b0c6efaa6b658fdb37a1da7ae19cb3..2681094ee9b4debcd34f3baed739f7b58e8bbd03 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_


@@ -16,15 +16,15 @@
 #pragma interface "gauge95.h"
 #endif
 
 #pragma interface "gauge95.h"
 #endif
 

+#if wxUSE_SLIDER
+

 #include "wx/control.h"
 
 #include "wx/control.h"
 

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

 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxControl
 {
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxControl
 {

-    DECLARE_DYNAMIC_CLASS(wxGauge95)
-

 public:
     wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
 
 public:
     wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
 


@@ -57,8 +57,11 @@ public:
     int GetRange(void) const ;
     int GetValue(void) const ;
 
     int GetRange(void) const ;
     int GetValue(void) const ;
 

-    void SetForegroundColour(const wxColour& col);
-    void SetBackgroundColour(const wxColour& col);
+    bool SetForegroundColour(const wxColour& col);
+    bool SetBackgroundColour(const wxColour& col);
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }

 
     // Backward compatibility
 #if WXWIN_COMPATIBILITY
 
     // Backward compatibility
 #if WXWIN_COMPATIBILITY


@@ -71,10 +74,11 @@ protected:
     int      m_rangeMax;
     int      m_gaugePos;
 
     int      m_rangeMax;
     int      m_gaugePos;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)

 };
 
 };
 

+#endif // wxUSE_GAUGE
+

 #endif
     // _GAUGEMSW_H_
 #endif
     // _GAUGEMSW_H_