Fix some compile errors and warnings when using gcc 3

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/gizmos/ledctrl.cpp b/contrib/src/gizmos/ledctrl.cpp
index c33d38e7ab96d18e5c526cb946ea9734b82e31c9..e51fe72f1423aaf338c2b1c846dccc6c4406ee5b 100644 (file)
--- a/contrib/src/gizmos/ledctrl.cpp
+++ b/contrib/src/gizmos/ledctrl.cpp
@@ -134,6 +134,7 @@ void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
 {
     if (Value != m_Value)
     {
 {
     if (Value != m_Value)
     {

+#ifdef __WXDEBUG__

         if (!Value.IsEmpty())
         {
             for(size_t i=0; i<Value.Length(); i++) {
         if (!Value.IsEmpty())
         {
             for(size_t i=0; i<Value.Length(); i++) {


@@ -142,6 +143,7 @@ void wxLEDNumberCtrl::SetValue(wxString const &Value, bool Redraw)
                              wxT("wxLEDNumberCtrl can only display numeric string values."));
             }
         }
                              wxT("wxLEDNumberCtrl can only display numeric string values."));
             }
         }

+#endif

 
         m_Value = Value;
         RecalcInternals(GetClientSize());
 
         m_Value = Value;
         RecalcInternals(GetClientSize());


@@ -191,7 +193,7 @@ void wxLEDNumberCtrl::OnPaint(wxPaintEvent &Event)
             DrawDigit(MemDc, DIGITALL, i);
 
         // Draw the digits.
             DrawDigit(MemDc, DIGITALL, i);
 
         // Draw the digits.

-        switch (m_Value[i])
+        switch (m_Value.GetChar(i))

         {
             case '0' :
                 DrawDigit(MemDc, DIGIT0, i);
         {
             case '0' :
                 DrawDigit(MemDc, DIGIT0, i);


@@ -318,12 +320,12 @@ void wxLEDNumberCtrl::RecalcInternals(const wxSize &CurrentSize)
     if ((Height * 0.07) < 1)
         m_LineMargin = 1;
     else
     if ((Height * 0.07) < 1)
         m_LineMargin = 1;
     else

-        m_LineMargin = Height * 0.07;
+        m_LineMargin = (int)(Height * 0.07);

 
     if ((Height * 0.35) < 1)
         m_LineLength = 1;
     else
 
     if ((Height * 0.35) < 1)
         m_LineLength = 1;
     else

-        m_LineLength = Height * 0.35;
+        m_LineLength = (int)(Height * 0.35);

 
     m_LineWidth = m_LineMargin;
 
 
     m_LineWidth = m_LineMargin;