[#1472076] Fixes after stock gdi changes within core library.

[wxWidgets.git] / contrib / include / wx / gizmos / ledctrl.h

diff --git a/contrib/include/wx/gizmos/ledctrl.h b/contrib/include/wx/gizmos/ledctrl.h
index 19b3cffbf5386ac73281cb27b063cef7ad70b94c..486274ffd8831b6400c62f1343d99abf7f949ee9 100644 (file)
--- a/contrib/include/wx/gizmos/ledctrl.h
+++ b/contrib/include/wx/gizmos/ledctrl.h
@@ -1,16 +1,7 @@
 #ifndef _WX_LEDNUMBERCTRL_H_
 #define _WX_LEDNUMBERCTRL_H_
 
 #ifndef _WX_LEDNUMBERCTRL_H_
 #define _WX_LEDNUMBERCTRL_H_
 

-#ifdef __GNUG__
-    #pragma interface "wxLEDNumberCtrl.h"
-#endif
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"

 
 #include <wx/window.h>
 #include <wx/control.h>
 
 #include <wx/window.h>
 #include <wx/control.h>


@@ -38,18 +29,18 @@ enum wxLEDValueAlign
 // wxLEDNumberCtrl
 // ----------------------------------------------------------------------------
 
 // wxLEDNumberCtrl
 // ----------------------------------------------------------------------------
 

-class GIZMODLLEXPORT wxLEDNumberCtrl : public wxControl
+class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl : public wxControl

 {
 public:
     // Constructors.
     wxLEDNumberCtrl();
 {
 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.
                     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);
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0);


@@ -58,9 +49,9 @@ public:
     bool GetDrawFaded() const { return m_DrawFaded; }
     const wxString &GetValue() const { return m_Value; }
 
     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.
 
 private:
     // Members.