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

Typos fixed.

Browse Source 
Corrected children's deletion (strict now).
  Corrected scrolled window's setup upon startup
    (with/without scrollbars etc.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-11 18:28:37 +00:00
parent 1a5594b80f
commit eb082a088a
11 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/scroll/scroll.cpp
View File

@@ -79,15 +79,6 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER | wxTAB_TRAVERSAL )
{
SetBackgroundColour( *wxWHITE );
(void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
(void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
(void) new wxRadioButton( this, -1, "Disable", wxPoint(10,90) );
wxString choices[] =
{
"This",
@@ -97,9 +88,17 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
"examples."
};
(void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
// (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
// (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
(void) new wxRadioButton( this, -1, "Disable", wxPoint(10,90) );
// (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
(void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices );
SetBackgroundColour( *wxWHITE );
}
MyCanvas::~MyCanvas()
@@ -134,6 +133,7 @@ MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample",
wxPoint(20,20), wxSize(470,360) )
{
/*
wxMenu *file_menu = new wxMenu();
file_menu->Append( ID_ABOUT, "&About..");
file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
@@ -147,6 +147,7 @@ MyFrame::MyFrame()
int widths[] = { -1, 100 };
SetStatusWidths( 2, widths );
*/
m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
m_canvas->SetScrollbars( 10, 10, 50, 100 );
}