Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. corrected client data deletion in wxListBox (no more memory leaks in controls

Browse Source 
sample)
2. added wxST_NO_AUTORESIZE style for wxGTK and wxMSW and added test for it to
   the controls sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-24 16:29:08 +00:00
parent e6ebb51430
commit 185fa6bf6f
6 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
samples/controls/controls.cpp
View File

@@ -96,6 +96,7 @@ public:
void OnPageChanged( wxNotebookEvent &event );
void OnPageChanging( wxNotebookEvent &event );
void OnSliderUpdate( wxCommandEvent &event );
void OnUpdateLabel( wxCommandEvent &event );
#if wxUSE_SPINBUTTON
void OnSpinUp( wxSpinEvent &event );
void OnSpinDown( wxSpinEvent &event );
@@ -130,6 +131,8 @@ public:
wxTextCtrl *m_text;
wxNotebook *m_notebook;
wxStaticText *m_label;
private:
DECLARE_EVENT_TABLE()
};
@@ -200,7 +203,7 @@ bool MyApp::OnInit()
wxMenu *tooltip_menu = new wxMenu;
tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
tooltip_menu->AppendSeparator();
tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCrtl-T",
tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
"enable/disable tooltips", TRUE);
tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE);
menu_bar->Append(tooltip_menu, "&Tooltips");
@@ -267,6 +270,7 @@ const int ID_SLIDER = 181;
const int ID_SPIN = 182;
const int ID_BTNPROGRESS = 183;
const int ID_BUTTON_LABEL = 184;
BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_SIZE ( MyPanel::OnSize)
@@ -313,6 +317,7 @@ EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown)
EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress)
EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
#endif
EVT_BUTTON (ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
END_EVENT_TABLE()
MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
@@ -539,16 +544,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
dc.DrawText("Bitmap", 20, 20);
dc.SelectObject( wxNullBitmap );
wxBitmapButton *bmpBtn = new wxBitmapButton
(
panel,
-1,
bitmap,
wxPoint(100, 20)
);
bmpBtn = NULL; // suppress warning
new wxButton(panel, -1, "Another button", wxPoint(250, 20));
(void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
(void)new wxButton(panel, ID_BUTTON_LABEL, "Toggle label", wxPoint(250, 20));
m_label = new wxStaticText(panel, -1, "Label with some long text",
wxPoint(250, 60), wxDefaultSize,
wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
m_notebook->AddPage(panel, "wxBitmapXXX");
@@ -586,11 +586,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
panel->SetAutoLayout( true );
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
sizer->Add( 20,20, 1 );
sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
panel->SetSizer( sizer );
m_notebook->AddPage(panel, "wxSizer");
@@ -892,6 +892,14 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
m_text->SetFont( *wxITALIC_FONT );
}
void MyPanel::OnUpdateLabel( wxCommandEvent &WXUNUSED(event) )
{
static bool s_long = TRUE;
s_long = !s_long;
m_label->SetLabel(s_long ? "very very very long text" : "shorter text");
}
void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
{
m_gauge->SetValue( m_slider->GetValue() );