Add wxCLOSE_BOX to wxFL samples (consider using wxDEFAULT_FRAME_STYLE).
Whitespace/typo fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -129,7 +129,7 @@ MyFrame::MyFrame(wxFrame *frame)
|
||||
: wxFrame( frame, wxID_ANY, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition,
|
||||
wxSize( 700, 500 ),
|
||||
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX,
|
||||
wxT("freimas") )
|
||||
{
|
||||
mpClientWnd = CreateTextCtrl( _("Client window") );
|
||||
|
@@ -622,7 +622,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
|
||||
{
|
||||
bool isNested = (pParent != mpInternalFrm);
|
||||
|
||||
// check if we're craeting nested layout
|
||||
// check if we're creating nested layout
|
||||
if ( isNested )
|
||||
{
|
||||
layout.mBorderPen.SetColour( 128,255,128 );
|
||||
|
@@ -107,7 +107,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
|
||||
: wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
|
||||
wxSize( 700, 500 ),
|
||||
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX,
|
||||
wxT("freimas") )
|
||||
{
|
||||
mpInternalFrm = (wxPanel*)this;
|
||||
|
@@ -108,7 +108,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
|
||||
: wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
|
||||
wxSize( 700, 500 ),
|
||||
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX,
|
||||
wxT("freimas") )
|
||||
{
|
||||
}
|
||||
|
@@ -113,7 +113,7 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
|
||||
: wxFrame( parent, wxID_ANY, title, wxDefaultPosition,
|
||||
wxSize( 700, 500 ),
|
||||
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX,
|
||||
wxT("freimas") )
|
||||
{
|
||||
|
||||
@@ -316,15 +316,15 @@ void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) )
|
||||
wxYield(); // HACK !!! needed to resize BEFORE redraw
|
||||
mpLayout->RefreshNow( true ); // HACK !!! needed to trigger redraw
|
||||
|
||||
// // mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
|
||||
// // mpLayout->RecalcLayout(true);
|
||||
// // mpLayout->RepositionFloatedBar(x);
|
||||
// // mpLayout->RecalcLayout(true);
|
||||
// // mpLayout->RepositionFloatedBar(x);
|
||||
// // mpLayout->SetBarState(x, 0, true);
|
||||
// // wxYield();
|
||||
// // mpLayout->RefreshNow( true );
|
||||
// // mpLayout->RecalcLayout(true);
|
||||
// mpLayout->SetBarState(x, wxCBAR_FLOATING, true);
|
||||
// mpLayout->RecalcLayout(true);
|
||||
// mpLayout->RepositionFloatedBar(x);
|
||||
// mpLayout->RecalcLayout(true);
|
||||
// mpLayout->RepositionFloatedBar(x);
|
||||
// mpLayout->SetBarState(x, 0, true);
|
||||
// wxYield();
|
||||
// mpLayout->RefreshNow( true );
|
||||
// mpLayout->RecalcLayout(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user