Fix for mingw32 compilation (replaced #ifdef NM_CUSTOMDRAW with a test for _WIN32_IE

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index e6a2d6dbdb53fa10d5345f1389e1832df31a9a73..8a0063d0b1ab81b1da4a0a76dde6c00e811236ba 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -36,19 +36,17 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #if wxUSE_NATIVE_STATUSBAR
 
-#if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)
     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
-#endif  //USE_SHARED_LIBRARY
 
 
 // ----------------------------------------------------------------------------
@@ -97,11 +95,11 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
     wstyle |= SBARS_SIZEGRIP;
 
   m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
-                                      _T(""),
+                                      wxT(""),
                                       (HWND)parent->GetHWND(),
                                       m_windowId);
   if ( m_hWnd == 0 ) {
-    wxLogSysError(_T("can't create status bar window"));
+    wxLogSysError(wxT("can't create status bar window"));
     return FALSE;
   }
 
@@ -147,6 +145,9 @@ void wxStatusBar95::SetStatusWidths(int n, const int widths[])
 
 void wxStatusBar95::SetFieldsWidth()
 {
+    if ( !m_nFields )
+        return;
+
   int *pWidths = new int[m_nFields];
 
   int nWindowWidth, y;
@@ -191,7 +192,7 @@ void wxStatusBar95::SetFieldsWidth()
   }
 
   if ( !StatusBar_SetParts(hwnd, m_nFields, pWidths) ) {
-    wxLogLastError(_T("StatusBar_SetParts"));
+    wxLogLastError(wxT("StatusBar_SetParts"));
   }
 
   delete [] pWidths;
@@ -200,7 +201,7 @@ void wxStatusBar95::SetFieldsWidth()
 void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 {
   if ( !StatusBar_SetText(hwnd, nField, strText) ) {
-    wxLogLastError(_T("StatusBar_SetText"));
+    wxLogLastError(wxT("StatusBar_SetText"));
   }
 }
 
@@ -208,7 +209,7 @@ wxString wxStatusBar95::GetStatusText(int nField) const
 {
   wxASSERT( (nField > -1) && (nField < m_nFields) );
 
-  wxString str(_T(""));
+  wxString str(wxT(""));
   int len = StatusBar_GetTextLen(hwnd, nField);
   if (len > 0)
   {