X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..6ecfe2ac4981d681466520df56cb1a5366469ddf:/src/msw/statbr95.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 17418306b8..8a0063d0b1 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -42,13 +42,11 @@ #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) {