X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..60811dc6ccaac78a74aa014f0db78d179fe2f533:/include/wx/msw/gaugemsw.h?ds=inline diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h index b21b098c66..7f0a1f39f3 100644 --- a/include/wx/msw/gaugemsw.h +++ b/include/wx/msw/gaugemsw.h @@ -18,62 +18,58 @@ #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; } + DECLARE_DYNAMIC_CLASS(wxGaugeMSW) - 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); - } +public: + wxGaugeMSW(void) { m_rangeMax = 0; m_gaugePos = 0; } - 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); + 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); + } - void SetShadowWidth(int w); - void SetBezelFace(int w); - void SetRange(int r); - void SetValue(int pos); + 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); - int GetShadowWidth(void) const ; - int GetBezelFace(void) const ; - int GetRange(void) const ; - int GetValue(void) const ; + void SetShadowWidth(int w); + void SetBezelFace(int w); + void SetRange(int r); + void SetValue(int pos); - void SetForegroundColour(const wxColour& col); - void SetBackgroundColour(const wxColour& col); + int GetShadowWidth(void) const ; + int GetBezelFace(void) const ; + int GetRange(void) const ; + int GetValue(void) const ; - // Backward compatibility + bool SetForegroundColour(const wxColour& col); + bool SetBackgroundColour(const wxColour& col); + + // 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