X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..3bcf00abd7aa6b515e776e18b3e295467a693959:/src/msw/statbr95.cpp?ds=sidebyside diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index a040fbaed1..e6a2d6dbdb 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -33,28 +33,19 @@ #include "wx/generic/statusbr.h" #include "wx/msw/statbr95.h" -#include -#include +#include "wx/msw/private.h" +#include #if !defined(__GNUWIN32__) || defined(__TWIN32__) -#include +#include #endif -#ifdef GetClassInfo -#undef GetClassInfo -#endif - -#ifdef GetClassName -#undef GetClassName -#endif - -#if wxUSE_NATIVE_STATUSBAR +#if wxUSE_NATIVE_STATUSBAR #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar); BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar) - EVT_PAINT(wxWindow::OnPaint) EVT_SIZE(wxStatusBar95::OnSize) END_EVENT_TABLE() #endif //USE_SHARED_LIBRARY @@ -66,9 +57,9 @@ // windowsx.h and commctrl.h don't define those, so we do it here #define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w) -#define StatusBar_SetText(h, n, t) SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCSTR)t) +#define StatusBar_SetText(h, n, t) SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t) #define StatusBar_GetTextLen(h, n) LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0)) -#define StatusBar_GetText(h, n, s) LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPSTR)s)) +#define StatusBar_GetText(h, n, s) LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s)) #define hwnd ((HWND)m_hWnd) @@ -106,11 +97,11 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style) wstyle |= SBARS_SIZEGRIP; m_hWnd = (WXHWND)CreateStatusWindow(wstyle, - "", + _T(""), (HWND)parent->GetHWND(), m_windowId); if ( m_hWnd == 0 ) { - wxLogSysError("can't create status bar window"); + wxLogSysError(_T("can't create status bar window")); return FALSE; } @@ -200,7 +191,7 @@ void wxStatusBar95::SetFieldsWidth() } if ( !StatusBar_SetParts(hwnd, m_nFields, pWidths) ) { - wxLogDebug("StatusBar_SetParts failed."); + wxLogLastError(_T("StatusBar_SetParts")); } delete [] pWidths; @@ -209,7 +200,7 @@ void wxStatusBar95::SetFieldsWidth() void wxStatusBar95::SetStatusText(const wxString& strText, int nField) { if ( !StatusBar_SetText(hwnd, nField, strText) ) { - wxLogDebug("StatusBar_SetText failed"); + wxLogLastError(_T("StatusBar_SetText")); } } @@ -217,7 +208,7 @@ wxString wxStatusBar95::GetStatusText(int nField) const { wxASSERT( (nField > -1) && (nField < m_nFields) ); - wxString str(""); + wxString str(_T("")); int len = StatusBar_GetTextLen(hwnd, nField); if (len > 0) { @@ -236,7 +227,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event) SetFieldsWidth(); } -#endif - // __WIN95__ -#endif - // wxUSE_NATIVE_STATUSBAR +#endif // wxUSE_NATIVE_STATUSBAR + +#else + #error "wxStatusBar95 is only available under Windows 95 and later." +#endif // __WIN95__ +