6cf6897100
Calls to SetStatusText() in between Push/PopStatusText() were simply lost before, now the text explicitly changed by SetStatusText() is preserved by the next call to PopStatusText(). This required adding a new virtual method, called DoUpdateStatusText(), which is now implemented in all the derived classes instead of overriding SetStatusText() (on the bright side, it doesn't need to do any checks already done in the base class any more). Also fix PushStatusText() to actually show the text being pushed at all under wxMSW as a side effect. And further reduce code duplication between wxStatusBarBase and the derived classes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
45 lines
1.4 KiB
C++
45 lines
1.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/mac/carbon/statusbr.h
|
|
// Purpose: native implementation of wxStatusBar.
|
|
// Optional: can use generic version instead.
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATBAR_H_
|
|
#define _WX_STATBAR_H_
|
|
|
|
class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
|
|
{
|
|
DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
|
|
|
|
wxStatusBarMac();
|
|
wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr);
|
|
|
|
virtual ~wxStatusBarMac();
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
|
|
long style = wxSTB_DEFAULT_STYLE,
|
|
const wxString& name = wxStatusBarNameStr);
|
|
|
|
virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
|
|
virtual void DrawField(wxDC& dc, int i, int textHeight);
|
|
|
|
// Implementation
|
|
virtual void MacHiliteChanged();
|
|
void OnPaint(wxPaintEvent& event);
|
|
|
|
protected:
|
|
virtual void DoUpdateStatusText(int number = 0);
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
};
|
|
|
|
#endif // _WX_STATBAR_H_
|