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

Corrected wxlistBox, wxRadioBox, wxComboBox and

Browse Source 
wxChoice in that they do no longer send events
    after programmatic calls
  Corrected wxStaticBitmap
  Reimplemented wxRadioButton as per wxMSW
  Updated docs for the above
  Update testconf for socket changes
  Other minor fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-22 23:28:55 +00:00
parent 1e7fd31108
commit 953704c1c7
43 changed files with 502 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/controls/controls.cpp
View File

@@ -398,13 +398,16 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
(void)new wxButton( panel, ID_CHOICE_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
(void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
/*
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
wxSize sizeIcon = wxSize(icon.GetWidth(), icon.GetHeight());
wxStaticBitmap *bitmap = new wxStaticBitmap( panel, -1, icon, wxPoint(50, 60), sizeIcon);
// this doesn't work under wxGTK
bitmap = new wxStaticBitmap( panel, -1, wxNullBitmap, wxPoint(10, 60), sizeIcon);
(void)new wxStaticBitmap( panel, -1, icon, wxPoint(50, 60), sizeIcon);
wxStaticBitmap *bitmap = new wxStaticBitmap( panel, -1, wxNullBitmap, wxPoint(10, 60), sizeIcon);
bitmap->SetBitmap(icon);
*/
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
(void)new wxStaticBitmap( panel, -1, icon, wxPoint(50, 60) );
wxStaticBitmap *bitmap = new wxStaticBitmap( panel, -1, wxNullBitmap, wxPoint(10, 60) );
bitmap->SetBitmap(icon);
m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
@@ -494,8 +497,8 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
if ( selOld == 2 && selNew == 4 )
{
wxMessageBox("This demonstrates how a program may prevent the "
"page change from taking place - the current page will "
"stay the third one", "Conntrol sample",
"page change from taking place - \n the current page will "
"stay the third one", "Control sample",
wxICON_INFORMATION | wxOK);
event.Veto();