/////////////////////////////////////////////////////////////////////////////
-// Program: wxWindows Widgets Sample
+// Program: wxWidgets Widgets Sample
// Name: static.cpp
// Purpose: Part of the widgets sample showing various static controls
// Author: Vadim Zeitlin
#ifndef WX_PRECOMP
#include "wx/log.h"
+ #include "wx/bitmap.h"
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/radiobox.h"
#include "wx/statline.h"
#include "widgets.h"
-
#include "icons/statbox.xpm"
// ----------------------------------------------------------------------------
StaticVAlign_Max
};
+// ----------------------------------------------------------------------------
+// MyStaticText and MyStaticBox
+// ----------------------------------------------------------------------------
+
+// these 2 classes simply show that the static controls can get the mouse
+// clicks too -- this used to be broken under MSW but works now
+
+class MyStaticText : public wxStaticText
+{
+public:
+ MyStaticText(wxWindow* parent,
+ wxWindowID id,
+ const wxString& label,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0)
+ : wxStaticText(parent, id, label, pos, size, style)
+ {
+ }
+
+protected:
+ void OnMouseEvent(wxMouseEvent& WXUNUSED(event))
+ {
+ wxLogMessage(wxT("Clicked on static text"));
+ }
+
+ DECLARE_EVENT_TABLE()
+};
+
+class MyStaticBox : public wxStaticBox
+{
+public:
+ MyStaticBox(wxWindow* parent,
+ wxWindowID id,
+ const wxString& label,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0)
+ : wxStaticBox(parent, id, label, pos, size, style)
+ {
+ }
+
+protected:
+ void OnMouseEvent(wxMouseEvent& WXUNUSED(event))
+ {
+ wxLogMessage(wxT("Clicked on static box"));
+ }
+
+ DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(MyStaticText, wxStaticText)
+ EVT_LEFT_UP(MyStaticText::OnMouseEvent)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyStaticBox, wxStaticBox)
+ EVT_LEFT_UP(MyStaticBox::OnMouseEvent)
+END_EVENT_TABLE()
+
// ----------------------------------------------------------------------------
// StaticWidgetsPage
// ----------------------------------------------------------------------------
*m_radioVAlign;
// the controls and the sizer containing them
+ wxStaticBox *m_staticBox;
wxStaticBoxSizer *m_sizerStatBox;
wxStaticText *m_statText;
wxStaticLine *m_statLine;
EVT_BUTTON(StaticPage_LabelText, StaticWidgetsPage::OnButtonLabelText)
EVT_BUTTON(StaticPage_BoxText, StaticWidgetsPage::OnButtonBoxText)
- EVT_CHECKBOX(-1, StaticWidgetsPage::OnCheckOrRadioBox)
- EVT_RADIOBOX(-1, StaticWidgetsPage::OnCheckOrRadioBox)
+ EVT_CHECKBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox)
+ EVT_RADIOBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox)
END_EVENT_TABLE()
// ============================================================================
m_statLine = (wxStaticLine *)NULL;
m_statText = (wxStaticText *)NULL;
+ m_staticBox = (wxStaticBox *)NULL;
m_sizerStatBox = (wxStaticBoxSizer *)NULL;
m_sizerStatic = (wxSizer *)NULL;
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
_T("bottom"),
};
- m_radioHAlign = new wxRadioBox(this, -1, _T("&Horz alignment"),
+ m_radioHAlign = new wxRadioBox(this, wxID_ANY, _T("&Horz alignment"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(halign), halign);
- m_radioVAlign = new wxRadioBox(this, -1, _T("&Vert alignment"),
+ m_radioVAlign = new wxRadioBox(this, wxID_ANY, _T("&Vert alignment"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(valign), valign);
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
- wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change labels"));
+ wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change labels"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxSizer *sizerRow;
sizerRow = CreateSizerWithTextAndButton(StaticPage_BoxText,
_T("Change &box label"),
- -1, &m_textBox);
+ wxID_ANY, &m_textBox);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(StaticPage_LabelText,
_T("Change &text label"),
- -1, &m_textLabel);
+ wxID_ANY, &m_textLabel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
m_textBox->SetValue(_T("This is a box"));
// right pane
wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
- sizerRight->SetMinSize(250, 0);
+ sizerRight->SetMinSize(150, 0);
m_sizerStatic = sizerRight;
CreateStatic();
// the 3 panes panes compose the window
sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
- sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);
+ sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10);
sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
// final initializations
Reset();
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
sizerTop->Fit(this);
void StaticWidgetsPage::Reset()
{
- m_chkVert->SetValue(FALSE);
- m_chkAutoResize->SetValue(TRUE);
+ m_chkVert->SetValue(false);
+ m_chkAutoResize->SetValue(true);
m_radioHAlign->SetSelection(StaticHAlign_Left);
m_radioVAlign->SetSelection(StaticVAlign_Top);
if ( m_sizerStatBox )
{
- m_sizerStatic->Remove(m_sizerStatBox);
-
+ delete m_staticBox;
// delete m_sizerStatBox; -- deleted by Remove()
+ m_sizerStatic->Remove(m_sizerStatBox);
delete m_statText;
delete m_statLine;
}
flagsText |= align;
flagsBox |= align;
- wxStaticBox *box = new wxStaticBox(this, -1, m_textBox->GetValue(),
- wxDefaultPosition, wxDefaultSize,
- flagsBox);
- m_sizerStatBox = new wxStaticBoxSizer(box, isVert ? wxHORIZONTAL
- : wxVERTICAL);
+ m_staticBox = new MyStaticBox(this, wxID_ANY, m_textBox->GetValue(),
+ wxDefaultPosition, wxDefaultSize,
+ flagsBox);
+ m_sizerStatBox = new wxStaticBoxSizer(m_staticBox, isVert ? wxHORIZONTAL
+ : wxVERTICAL);
- m_statText = new wxStaticText(this, -1, m_textLabel->GetValue(),
+ m_statText = new MyStaticText(this, wxID_ANY, m_textLabel->GetValue(),
wxDefaultPosition, wxDefaultSize,
flagsText);
- m_statLine = new wxStaticLine(this, -1,
+ m_statLine = new wxStaticLine(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
isVert ? wxLI_VERTICAL : wxLI_HORIZONTAL);
CreateStatic();
}
-void StaticWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void StaticWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
{
CreateStatic();
}
-void StaticWidgetsPage::OnButtonBoxText(wxCommandEvent& event)
+void StaticWidgetsPage::OnButtonBoxText(wxCommandEvent& WXUNUSED(event))
{
m_sizerStatBox->GetStaticBox()->SetLabel(m_textBox->GetValue());
}
-void StaticWidgetsPage::OnButtonLabelText(wxCommandEvent& event)
+void StaticWidgetsPage::OnButtonLabelText(wxCommandEvent& WXUNUSED(event))
{
m_statText->SetLabel(m_textLabel->GetValue());
}
projects / wxWidgets.git / blobdiff