remove tabs added by error in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -113,7 +113,7 @@ public:
 | 
				
			|||||||
        Saves the current field text in a per field stack, and sets the field text
 | 
					        Saves the current field text in a per field stack, and sets the field text
 | 
				
			||||||
        to the string passed as argument.
 | 
					        to the string passed as argument.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		@see PopStatusText()
 | 
					        @see PopStatusText()
 | 
				
			||||||
    */
 | 
					    */
 | 
				
			||||||
    void PushStatusText(const wxString& string, int field = 0);
 | 
					    void PushStatusText(const wxString& string, int field = 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -184,7 +184,7 @@ public:
 | 
				
			|||||||
            Contains an array of n integers, each of which is either an
 | 
					            Contains an array of n integers, each of which is either an
 | 
				
			||||||
            absolute status field width in pixels if positive or indicates a
 | 
					            absolute status field width in pixels if positive or indicates a
 | 
				
			||||||
            variable width field if negative.
 | 
					            variable width field if negative.
 | 
				
			||||||
			The special value @NULL means that all fields should get the same width.
 | 
					            The special value @NULL means that all fields should get the same width.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        @remarks The widths of the variable fields are calculated from the total
 | 
					        @remarks The widths of the variable fields are calculated from the total
 | 
				
			||||||
                 width of all fields, minus the sum of widths of the
 | 
					                 width of all fields, minus the sum of widths of the
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -153,7 +153,7 @@ class MyFrame : public wxMDIParentFrame
 | 
				
			|||||||
    void OnQuit(wxCommandEvent& event);
 | 
					    void OnQuit(wxCommandEvent& event);
 | 
				
			||||||
    void OnAbout(wxCommandEvent& event);
 | 
					    void OnAbout(wxCommandEvent& event);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	void OnResetFieldsWidth(wxCommandEvent& event);
 | 
					    void OnResetFieldsWidth(wxCommandEvent& event);
 | 
				
			||||||
    void OnSetStatusFields(wxCommandEvent& event);
 | 
					    void OnSetStatusFields(wxCommandEvent& event);
 | 
				
			||||||
    void OnRecreateStatusBar(wxCommandEvent& event);
 | 
					    void OnRecreateStatusBar(wxCommandEvent& event);
 | 
				
			||||||
    void OnSetStyleNormal(wxCommandEvent& event);
 | 
					    void OnSetStyleNormal(wxCommandEvent& event);
 | 
				
			||||||
@@ -168,7 +168,7 @@ private:
 | 
				
			|||||||
        StatBar_Max
 | 
					        StatBar_Max
 | 
				
			||||||
    } m_statbarKind;
 | 
					    } m_statbarKind;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	void OnUpdateResetFieldsWidth(wxUpdateUIEvent& event);
 | 
					    void OnUpdateResetFieldsWidth(wxUpdateUIEvent& event);
 | 
				
			||||||
    void OnUpdateSetStatusFields(wxUpdateUIEvent& event);
 | 
					    void OnUpdateSetStatusFields(wxUpdateUIEvent& event);
 | 
				
			||||||
    void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);
 | 
					    void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);
 | 
				
			||||||
    void OnUpdateSetStyleNormal(wxUpdateUIEvent& event);
 | 
					    void OnUpdateSetStyleNormal(wxUpdateUIEvent& event);
 | 
				
			||||||
@@ -204,7 +204,7 @@ enum
 | 
				
			|||||||
    // menu items
 | 
					    // menu items
 | 
				
			||||||
    StatusBar_Quit = 1,
 | 
					    StatusBar_Quit = 1,
 | 
				
			||||||
    StatusBar_SetFields,
 | 
					    StatusBar_SetFields,
 | 
				
			||||||
	StatusBar_ResetFieldsWidth,
 | 
					    StatusBar_ResetFieldsWidth,
 | 
				
			||||||
    StatusBar_Recreate,
 | 
					    StatusBar_Recreate,
 | 
				
			||||||
    StatusBar_About,
 | 
					    StatusBar_About,
 | 
				
			||||||
    StatusBar_Toggle,
 | 
					    StatusBar_Toggle,
 | 
				
			||||||
@@ -240,7 +240,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 | 
				
			|||||||
    EVT_MENU(StatusBar_SetStyleFlat, MyFrame::OnSetStyleFlat)
 | 
					    EVT_MENU(StatusBar_SetStyleFlat, MyFrame::OnSetStyleFlat)
 | 
				
			||||||
    EVT_MENU(StatusBar_SetStyleRaised, MyFrame::OnSetStyleRaised)
 | 
					    EVT_MENU(StatusBar_SetStyleRaised, MyFrame::OnSetStyleRaised)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	EVT_UPDATE_UI(StatusBar_ResetFieldsWidth, MyFrame::OnUpdateResetFieldsWidth)
 | 
					    EVT_UPDATE_UI(StatusBar_ResetFieldsWidth, MyFrame::OnUpdateResetFieldsWidth)
 | 
				
			||||||
    EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)
 | 
					    EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)
 | 
				
			||||||
    EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields)
 | 
					    EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields)
 | 
				
			||||||
    EVT_UPDATE_UI(StatusBar_SetStyleNormal, MyFrame::OnUpdateSetStyleNormal)
 | 
					    EVT_UPDATE_UI(StatusBar_SetStyleNormal, MyFrame::OnUpdateSetStyleNormal)
 | 
				
			||||||
@@ -282,7 +282,7 @@ bool MyApp::OnInit()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    // create the main application window
 | 
					    // create the main application window
 | 
				
			||||||
    MyFrame *frame = new MyFrame(_T("wxStatusBar sample"),
 | 
					    MyFrame *frame = new MyFrame(_T("wxStatusBar sample"),
 | 
				
			||||||
                                 wxPoint(50, 50), wxSize(450, 340));
 | 
					                                wxPoint(50, 50), wxSize(450, 340));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // and show it (the frames, unlike simple controls, are not shown when
 | 
					    // and show it (the frames, unlike simple controls, are not shown when
 | 
				
			||||||
    // created initially)
 | 
					    // created initially)
 | 
				
			||||||
@@ -301,9 +301,9 @@ bool MyApp::OnInit()
 | 
				
			|||||||
// frame constructor
 | 
					// frame constructor
 | 
				
			||||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 | 
					MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 | 
				
			||||||
#ifdef USE_MDI_PARENT_FRAME
 | 
					#ifdef USE_MDI_PARENT_FRAME
 | 
				
			||||||
       : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
 | 
					    : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
       : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
 | 
					    : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_statbarDefault = NULL;
 | 
					    m_statbarDefault = NULL;
 | 
				
			||||||
@@ -333,7 +333,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    statbarMenu->Append(StatusBar_ResetFieldsWidth, _T("Reset field widths"),
 | 
					    statbarMenu->Append(StatusBar_ResetFieldsWidth, _T("Reset field widths"),
 | 
				
			||||||
                        _T("Sets all fields to the same width"));
 | 
					                        _T("Sets all fields to the same width"));
 | 
				
			||||||
	statbarMenu->AppendSeparator();
 | 
					    statbarMenu->AppendSeparator();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    statbarMenu->Append(StatusBar_Toggle, _T("&Toggle Status Bar"),
 | 
					    statbarMenu->Append(StatusBar_Toggle, _T("&Toggle Status Bar"),
 | 
				
			||||||
                        _T("Toggle the status bar display"), true);
 | 
					                        _T("Toggle the status bar display"), true);
 | 
				
			||||||
@@ -415,14 +415,14 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 | 
				
			|||||||
    wxStatusBar *sb = GetStatusBar();
 | 
					    wxStatusBar *sb = GetStatusBar();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    long nFields = wxGetNumberFromUser
 | 
					    long nFields = wxGetNumberFromUser
 | 
				
			||||||
                   (
 | 
					                (
 | 
				
			||||||
                    _T("Select the number of fields in the status bar"),
 | 
					                    _T("Select the number of fields in the status bar"),
 | 
				
			||||||
                    _T("Fields:"),
 | 
					                    _T("Fields:"),
 | 
				
			||||||
                    _T("wxWidgets statusbar sample"),
 | 
					                    _T("wxWidgets statusbar sample"),
 | 
				
			||||||
                    sb->GetFieldsCount(),
 | 
					                    sb->GetFieldsCount(),
 | 
				
			||||||
                    1, 5,
 | 
					                    1, 5,
 | 
				
			||||||
                    this
 | 
					                    this
 | 
				
			||||||
                   );
 | 
					                );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // we don't check if the number changed at all on purpose: calling
 | 
					    // we don't check if the number changed at all on purpose: calling
 | 
				
			||||||
    // SetFieldsCount() with the same number of fields should be ok
 | 
					    // SetFieldsCount() with the same number of fields should be ok
 | 
				
			||||||
@@ -478,14 +478,14 @@ void MyFrame::OnUpdateResetFieldsWidth(wxUpdateUIEvent& event)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event))
 | 
					void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event))
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	wxStatusBar *pStat = GetStatusBar();
 | 
					    wxStatusBar *pStat = GetStatusBar();
 | 
				
			||||||
	if (pStat)
 | 
					    if (pStat)
 | 
				
			||||||
	{
 | 
					    {
 | 
				
			||||||
		int n = pStat->GetFieldsCount();
 | 
					        int n = pStat->GetFieldsCount();
 | 
				
			||||||
		pStat->SetStatusWidths(n, NULL);
 | 
					        pStat->SetStatusWidths(n, NULL);
 | 
				
			||||||
		for (int i=0; i<n; i++)
 | 
					        for (int i=0; i<n; i++)
 | 
				
			||||||
			pStat->SetStatusText("same size", i);
 | 
					            pStat->SetStatusText("same size", i);
 | 
				
			||||||
	}
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event)
 | 
					void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event)
 | 
				
			||||||
@@ -510,7 +510,7 @@ void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event))
 | 
				
			|||||||
void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 | 
					void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default
 | 
					    DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default
 | 
				
			||||||
                                                      : StatBar_Custom);
 | 
					                                                    : StatBar_Custom);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 | 
					void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 | 
				
			||||||
@@ -579,13 +579,13 @@ void MyFrame::ApplyStyle()
 | 
				
			|||||||
// ----------------------------------------------------------------------------
 | 
					// ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MyAboutDialog::MyAboutDialog(wxWindow *parent)
 | 
					MyAboutDialog::MyAboutDialog(wxWindow *parent)
 | 
				
			||||||
             : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")),
 | 
					            : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")),
 | 
				
			||||||
                        wxDefaultPosition, wxDefaultSize,
 | 
					                        wxDefaultPosition, wxDefaultSize,
 | 
				
			||||||
                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 | 
					                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    wxStaticText *text = new wxStaticText(this, wxID_ANY,
 | 
					    wxStaticText *text = new wxStaticText(this, wxID_ANY,
 | 
				
			||||||
                                          _T("wxStatusBar sample\n")
 | 
					                                        _T("wxStatusBar sample\n")
 | 
				
			||||||
                                          _T("(c) 2000 Vadim Zeitlin"));
 | 
					                                        _T("(c) 2000 Vadim Zeitlin"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    wxButton *btn = new wxButton(this, wxID_OK, _T("&Close"));
 | 
					    wxButton *btn = new wxButton(this, wxID_OK, _T("&Close"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -624,12 +624,12 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MyStatusBar::MyStatusBar(wxWindow *parent)
 | 
					MyStatusBar::MyStatusBar(wxWindow *parent)
 | 
				
			||||||
           : wxStatusBar(parent, wxID_ANY)
 | 
					        : wxStatusBar(parent, wxID_ANY)
 | 
				
			||||||
#if wxUSE_TIMER
 | 
					#if wxUSE_TIMER
 | 
				
			||||||
             , m_timer(this)
 | 
					            , m_timer(this)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#if wxUSE_CHECKBOX
 | 
					#if wxUSE_CHECKBOX
 | 
				
			||||||
             , m_checkbox(NULL)
 | 
					            , m_checkbox(NULL)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
 | 
					    static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
 | 
				
			||||||
@@ -646,16 +646,16 @@ MyStatusBar::MyStatusBar(wxWindow *parent)
 | 
				
			|||||||
    m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm));
 | 
					    m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm));
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(),
 | 
					    m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(),
 | 
				
			||||||
                                   wxDefaultPosition, wxDefaultSize,
 | 
					                                wxDefaultPosition, wxDefaultSize,
 | 
				
			||||||
                                   wxBU_EXACTFIT);
 | 
					                                wxBU_EXACTFIT);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if wxUSE_TIMER
 | 
					#if wxUSE_TIMER
 | 
				
			||||||
    m_timer.Start(1000);
 | 
					    m_timer.Start(1000);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    SetMinHeight(120);//wxMax(m_statbmp->GetBestSize().GetHeight(),
 | 
					    SetMinHeight(wxMax(m_statbmp->GetBestSize().GetHeight(),
 | 
				
			||||||
				//	   m_checkbox->GetBestSize().GetHeight()));
 | 
					                       m_checkbox->GetBestSize().GetHeight()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    UpdateClock();
 | 
					    UpdateClock();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -86,35 +86,35 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
 | 
				
			|||||||
        m_panes.RemoveAt(number, m_panes.GetCount()-number);
 | 
					        m_panes.RemoveAt(number, m_panes.GetCount()-number);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// SetStatusWidths will automatically refresh
 | 
					    // SetStatusWidths will automatically refresh
 | 
				
			||||||
	SetStatusWidths(number, widths);
 | 
					    SetStatusWidths(number, widths);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
 | 
					void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
 | 
				
			||||||
                                      const int widths[])
 | 
					                                    const int widths[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 | 
					    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (widths == NULL)
 | 
					    if (widths == NULL)
 | 
				
			||||||
	{
 | 
					    {
 | 
				
			||||||
		// special value meaning: override explicit pane widths and make them all 
 | 
					        // special value meaning: override explicit pane widths and make them all
 | 
				
			||||||
		// of the same size
 | 
					        // of the same size
 | 
				
			||||||
		m_bSameWidthForAllPanes = true;
 | 
					        m_bSameWidthForAllPanes = true;
 | 
				
			||||||
	}
 | 
					    }
 | 
				
			||||||
	else
 | 
					    else
 | 
				
			||||||
	{
 | 
					    {
 | 
				
			||||||
		for ( size_t i = 0; i < m_panes.GetCount(); i++ )
 | 
					        for ( size_t i = 0; i < m_panes.GetCount(); i++ )
 | 
				
			||||||
			m_panes[i].nWidth = widths[i];
 | 
					            m_panes[i].nWidth = widths[i];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		m_bSameWidthForAllPanes = false;
 | 
					        m_bSameWidthForAllPanes = false;
 | 
				
			||||||
	}
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // update the display after the widths changed
 | 
					    // update the display after the widths changed
 | 
				
			||||||
    Refresh();
 | 
					    Refresh();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
 | 
					void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
 | 
				
			||||||
                                      const int styles[])
 | 
					                                    const int styles[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 | 
					    wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -153,8 +153,8 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 | 
				
			|||||||
        // calculate the total width of all the fixed width fields and the
 | 
					        // calculate the total width of all the fixed width fields and the
 | 
				
			||||||
        // total number of var field widths counting with multiplicity
 | 
					        // total number of var field widths counting with multiplicity
 | 
				
			||||||
        size_t nTotalWidth = 0,
 | 
					        size_t nTotalWidth = 0,
 | 
				
			||||||
               nVarCount = 0,
 | 
					            nVarCount = 0,
 | 
				
			||||||
               i;
 | 
					            i;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for ( i = 0; i < m_panes.GetCount(); i++ )
 | 
					        for ( i = 0; i < m_panes.GetCount(); i++ )
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user