#include "wx/msw/private.h"
#include <windowsx.h>
-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
#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)(LPTSTR)s))
-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-
-// static WNDPROC gs_wndprocStatBar = NULL;
-static WXFARPROC gs_wndprocStatBar = (WXFARPROC) NULL;
-
-LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
- UINT message,
- WPARAM wParam,
- LPARAM lParam)
-{
- if ( message == WM_COMMAND )
- {
- wxStatusBar95 *sb = (wxStatusBar95 *)GetWindowLong(hwnd, GWL_USERDATA);
- sb->MSWWindowProc(message, wParam, lParam);
- }
-
- return ::CallWindowProc(CASTWNDPROC gs_wndprocStatBar, hwnd, message, wParam, lParam);
-}
-
// ============================================================================
// implementation
// ============================================================================
wxStatusBar95::wxStatusBar95()
{
- SetParent(NULL);
- m_hWnd = 0;
- m_windowId = 0;
+ SetParent(NULL);
+ m_hWnd = 0;
+ m_windowId = 0;
}
bool wxStatusBar95::Create(wxWindow *parent,
m_windowId = id == -1 ? NewControlId() : id;
DWORD wstyle = WS_CHILD | WS_VISIBLE;
- if ( style & wxST_SIZEGRIP )
+
+ if ( style & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
+
+ // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
+ // (at least in the version of comctl32.dll I'm using), and the only way to
+ // turn it off is to use CCS_TOP style - as we position the status bar
+ // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP
+ // is not given
+ if ( !(style & wxST_SIZEGRIP) )
+ {
+ wstyle |= CCS_TOP;
+ }
+ else
+ {
+ // may be some versions of comctl32.dll do need it - anyhow, it won't
+ // do any harm
wstyle |= SBARS_SIZEGRIP;
+ }
m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
wxEmptyString,
}
SetFieldsCount(1);
-
- // we can't subclass this window as usual because the status bar window
- // proc processes WM_SIZE and WM_PAINT specially
- // SubclassWin(m_hWnd);
-
- // but we want to process the messages from it still, so do custom
- // subclassing here
- gs_wndprocStatBar = (WXFARPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC);
- SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc);
- SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this);
+ SubclassWin(m_hWnd);
return TRUE;
}
void wxStatusBar95::CopyFieldsWidth(const int widths[])
{
- if (widths && !m_statusWidths)
- m_statusWidths = new int[m_nFields];
-
- if ( widths != NULL ) {
- for ( int i = 0; i < m_nFields; i++ )
- m_statusWidths[i] = widths[i];
- }
- else {
- delete [] m_statusWidths;
- m_statusWidths = NULL;
- }
+ if (widths && !m_statusWidths)
+ m_statusWidths = new int[m_nFields];
+
+ if ( widths != NULL )
+ {
+ for ( int i = 0; i < m_nFields; i++ )
+ m_statusWidths[i] = widths[i];
+ }
+ else // no widths
+ {
+ delete [] m_statusWidths;
+ m_statusWidths = NULL;
+ }
}
void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
{
- // this is Windows limitation
- wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
+ // this is a Windows limitation
+ wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
- m_nFields = nFields;
+ m_nFields = nFields;
- CopyFieldsWidth(widths);
- SetFieldsWidth();
+ CopyFieldsWidth(widths);
+ SetFieldsWidth();
}
-void wxStatusBar95::SetStatusWidths(int n, const int widths[])
+void wxStatusBar95::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), const int widths[])
{
- wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+ wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
- CopyFieldsWidth(widths);
- SetFieldsWidth();
+ CopyFieldsWidth(widths);
+ SetFieldsWidth();
}
void wxStatusBar95::SetFieldsWidth()
wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
_T("invalid statusbar field index") );
- if ( !StatusBar_SetText(GetHwnd(), nField, strText) ) {
- wxLogLastError(wxT("StatusBar_SetText"));
- }
+ if ( !StatusBar_SetText(GetHwnd(), nField, strText) )
+ {
+ wxLogLastError(wxT("StatusBar_SetText"));
+ }
}
wxString wxStatusBar95::GetStatusText(int nField) const
wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
_T("invalid statusbar field index") );
- wxString str;
- int len = StatusBar_GetTextLen(GetHwnd(), nField);
- if (len > 0)
- {
- StatusBar_GetText(GetHwnd(), nField, str.GetWriteBuf(len));
- str.UngetWriteBuf();
- }
- return str;
+ wxString str;
+ int len = StatusBar_GetTextLen(GetHwnd(), nField);
+ if ( len > 0 )
+ {
+ StatusBar_GetText(GetHwnd(), nField, str.GetWriteBuf(len));
+ str.UngetWriteBuf();
+ }
+
+ return str;
}
int wxStatusBar95::GetBorderX() const
RECT r;
if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
{
- wxLogLastError("SendMessage(SB_GETRECT)");
+ wxLogLastError(wxT("SendMessage(SB_GETRECT)"));
}
wxCopyRECTToRect(r, rect);
void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
{
- FORWARD_WM_SIZE(GetHwnd(), SIZE_RESTORED, x, y, SendMessage);
-
- // adjust fields widths to the new size
- SetFieldsWidth();
+ // the status bar wnd proc must be forwarded the WM_SIZE message whenever
+ // the stat bar position/size is changed because it normally positions the
+ // control itself along bottom or top side of the parent window - failing
+ // to do so will result in nasty visual effects
+ FORWARD_WM_SIZE(GetHwnd(), SIZE_RESTORED, x, y, SendMessage);
+
+ // but now, when the standard status bar wnd proc did all it wanted to do,
+ // move the status bar to its correct location - usually this call may be
+ // omitted because for normal status bars (positioned along the bottom
+ // edge) the position is already set correctly, but if the user wants to
+ // position them in some exotic location, this is really needed
+ wxWindow::DoMoveWindow(x, y, width, height);
+
+ // adjust fields widths to the new size
+ SetFieldsWidth();
}
#endif // __WIN95__ && wxUSE_NATIVE_STATUSBAR
projects / wxWidgets.git / blobdiff