reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h
index b21b098c66962d0a713220656d1c250f4fc4b21a..78cf35fc14a817569166ea68ec296b28a8f9b070 100644 (file)
--- a/include/wx/msw/gaugemsw.h
+++ b/include/wx/msw/gaugemsw.h
@@ -18,62 +18,61 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box
 class WXDLLEXPORT wxGaugeMSW: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxGaugeMSW)
- public:
-  inline wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
-
-  inline wxGaugeMSW(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(void) const ;
-  int GetBezelFace(void) const ;
-  int GetRange(void) const ;
-  int GetValue(void) const ;
-
-  void SetForegroundColour(const wxColour& col);
-  void SetBackgroundColour(const wxColour& col);
-
-  // Backward compatibility
+    DECLARE_DYNAMIC_CLASS(wxGaugeMSW)
+
+public:
+    wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; }
+
+    wxGaugeMSW(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(void) const ;
+    int GetBezelFace(void) const ;
+    int GetRange(void) const ;
+    int GetValue(void) const ;
+
+    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
-  inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
+    void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
 #endif
 
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
-
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
+protected:
+    int      m_rangeMax;
+    int      m_gaugePos;
 };
 
 #endif