X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/950e7faf4a09c484409657cf17bae9b90d321475..e8332ccfe0cf1653b257d46d5c41339e2b2da438:/contrib/include/wx/gizmos/ledctrl.h?ds=sidebyside diff --git a/contrib/include/wx/gizmos/ledctrl.h b/contrib/include/wx/gizmos/ledctrl.h index 19b3cffbf5..4e5158fe3e 100644 --- a/contrib/include/wx/gizmos/ledctrl.h +++ b/contrib/include/wx/gizmos/ledctrl.h @@ -1,16 +1,11 @@ #ifndef _WX_LEDNUMBERCTRL_H_ #define _WX_LEDNUMBERCTRL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "wxLEDNumberCtrl.h" #endif -#ifdef GIZMOISDLL -#define GIZMODLLEXPORT WXDLLEXPORT -#else -#define GIZMODLLEXPORT -#endif - +#include "wx/gizmos/gizmos.h" #include #include @@ -38,18 +33,18 @@ enum wxLEDValueAlign // wxLEDNumberCtrl // ---------------------------------------------------------------------------- -class GIZMODLLEXPORT wxLEDNumberCtrl : public wxControl +class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl : public wxControl { public: // Constructors. wxLEDNumberCtrl(); - wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1, + wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED); // Create functions. - bool Create(wxWindow *parent, wxWindowID id = -1, + bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); @@ -58,9 +53,9 @@ public: bool GetDrawFaded() const { return m_DrawFaded; } const wxString &GetValue() const { return m_Value; } - void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = TRUE); - void SetDrawFaded(bool DrawFaded, bool Redraw = TRUE); - void SetValue(const wxString &Value, bool Redraw = TRUE); + void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = true); + void SetDrawFaded(bool DrawFaded, bool Redraw = true); + void SetValue(const wxString &Value, bool Redraw = true); private: // Members.