Test using wxString::ToCDouble() in wxAny.

[wxWidgets.git] / src / msw / statusbar.cpp

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index 48960afe2203a4a726539e1e94b9da83e8725687..c2767b34df438d6d4fa29989c2e166ce00470152 100644 (file)
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -153,11 +153,13 @@ wxStatusBar::~wxStatusBar()
     // occupy
     PostSizeEventToParent();
 
     // occupy
     PostSizeEventToParent();
 

+#if wxUSE_TOOLTIPS

     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
         wxDELETE(m_tooltips[i]);
     }
     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
         wxDELETE(m_tooltips[i]);
     }

+#endif // wxUSE_TOOLTIPS

 
     wxDELETE(m_pDC);
 }
 
     wxDELETE(m_pDC);
 }


@@ -178,6 +180,7 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
 
     // keep in synch also our m_tooltips array
 
 
     // keep in synch also our m_tooltips array
 

+#if wxUSE_TOOLTIPS

     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {


@@ -186,6 +189,7 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
 
     // shrink/expand the array:
     m_tooltips.resize(nFields, NULL);
 
     // shrink/expand the array:
     m_tooltips.resize(nFields, NULL);

+#endif // wxUSE_TOOLTIPS

 
     wxStatusBarBase::SetFieldsCount(nFields, widths);
 
 
     wxStatusBarBase::SetFieldsCount(nFields, widths);
 


@@ -271,6 +275,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
         style = SBT_NOBORDERS;
         break;
 
         style = SBT_NOBORDERS;
         break;
 

+    case wxSB_SUNKEN:

     case wxSB_NORMAL:
     default:
         style = 0;
     case wxSB_NORMAL:
     default:
         style = 0;


@@ -313,11 +318,12 @@ void wxStatusBar::DoUpdateStatusText(int nField)
 
     // Set the status text in the native control passing both field number and style.
     // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
 
     // Set the status text in the native control passing both field number and style.
     // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'

-    if ( !StatusBar_SetText(GetHwnd(), nField | style, text.wx_str()) )
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, text.t_str()) )

     {
         wxLogLastError("StatusBar_SetText");
     }
 
     {
         wxLogLastError("StatusBar_SetText");
     }
 

+#if wxUSE_TOOLTIPS

     if (HasFlag(wxSTB_SHOW_TIPS))
     {
         wxASSERT(m_tooltips.size() == m_panes.GetCount());
     if (HasFlag(wxSTB_SHOW_TIPS))
     {
         wxASSERT(m_tooltips.size() == m_panes.GetCount());


@@ -346,6 +352,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
             //else: leave m_tooltips[nField]==NULL
         }
     }
             //else: leave m_tooltips[nField]==NULL
         }
     }

+#endif // wxUSE_TOOLTIPS

 }
 
 wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const
 }
 
 wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const


@@ -388,12 +395,14 @@ const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics()
         // into account to make sure the text drawn by user fits inside the
         // pane. Notice that it's not the value returned by SB_GETBORDERS
         // which, at least on this Windows 2003 system, returns {0, 2, 2}
         // into account to make sure the text drawn by user fits inside the
         // pane. Notice that it's not the value returned by SB_GETBORDERS
         // which, at least on this Windows 2003 system, returns {0, 2, 2}

+#if wxUSE_UXTHEME

         if ( wxUxThemeEngine::GetIfActive() )
         {
             s_metrics.gripWidth = 20;
             s_metrics.textMargin = 8;
         }
         else // classic/unthemed look
         if ( wxUxThemeEngine::GetIfActive() )
         {
             s_metrics.gripWidth = 20;
             s_metrics.textMargin = 8;
         }
         else // classic/unthemed look

+#endif // wxUSE_UXTHEME

         {
             s_metrics.gripWidth = 18;
             s_metrics.textMargin = 4;
         {
             s_metrics.gripWidth = 18;
             s_metrics.textMargin = 4;


@@ -545,6 +554,7 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
         case wxSB_FLAT:
             style = SBT_NOBORDERS;
             break;
         case wxSB_FLAT:
             style = SBT_NOBORDERS;
             break;

+        case wxSB_SUNKEN:

         case wxSB_NORMAL:
         default:
             style = 0;
         case wxSB_NORMAL:
         default:
             style = 0;


@@ -555,7 +565,7 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
         // the fields' styles.
         // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
         wxString text = GetStatusText(i);
         // the fields' styles.
         // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
         wxString text = GetStatusText(i);

-        if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
+        if (!StatusBar_SetText(GetHwnd(), style | i, text.t_str()))

         {
             wxLogLastError("StatusBar_SetText");
         }
         {
             wxLogLastError("StatusBar_SetText");
         }