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

Add wxCLOSE_BOX to wxFL samples (consider using wxDEFAULT_FRAME_STYLE).

Browse Source 
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:
Mart Raudsepp
2005-07-22 16:43:04 +00:00
parent b63269cabe
commit 0423ae974b
7 changed files with 279 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
contrib/samples/fl/fl_demo1.cpp
View File

@@ -54,37 +54,37 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
MyFrame *frame = new MyFrame(NULL);
frame->SetBackgroundColour( wxColour(192,192,192) );
wxMenu *file_menu = new wxMenu;
file_menu->Append( NEW_TEST_LOAD, _("&Load layouts") );
file_menu->Append( NEW_TEST_SAVE, _("&Store layouts") );
file_menu->Append( NEW_TEST_EXIT, _("E&xit") );
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, _("&File"));
frame->SetMenuBar(menu_bar);
#if wxUSE_STATUSBAR
frame->CreateStatusBar(3);
#endif // wxUSE_STATUSBAR
frame->Show(true);
frame->mpClientWnd->Refresh();
SetTopWindow(frame);
wxMessageBox(_("Hello, this demo has a bunch of yet-not-fixed-bugs and missing functionality\n\
The ONLY purpose is to demonstrate self-layouting toolbars,\nflat-bitmapped-buttons and 2-new FL-plugins \
(cbRowDragPlugin & cbBarHintsPlugin)\n\n\
BTW, disabled images and label-text are rendered at run-time") );
return true;
}
@@ -115,76 +115,76 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
{
wxTextCtrl* pCtrl =
new wxTextCtrl( this, wxID_ANY, value,
wxTextCtrl* pCtrl =
new wxTextCtrl( this, wxID_ANY, value,
wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
return pCtrl;
}
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,
: 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 | wxCLOSE_BOX,
wxT("freimas") )
{
mpClientWnd = CreateTextCtrl( _("Client window") );
mpLayout = new wxFrameLayout( this, mpClientWnd );
#if defined(__WXGTK__) || defined(__WXX11__)
cbCommonPaneProperties props;
mpLayout->GetPaneProperties( props );
props.mRealTimeUpdatesOn = false; // real-time OFF!!!
mpLayout->SetPaneProperties( props, wxALL_PANES );
#endif
mpLayout->SetUpdatesManager( new cbGCUpdatesMgr() );
// this is now default...
//mpLayout->SetMargins( 1,1,1,1 ); // gaps for vertical/horizontal/right/left panes
// setup plugins for testing
mpLayout->PushDefaultPlugins();
mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // fancy "X"es and bevel for bars
mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
// drop in some bars
cbDimInfo sizes0( 200,45, // when docked horizontally
200,85, // when docked vertically
175,35, // when floated
cbDimInfo sizes0( 200,45, // when docked horizontally
200,85, // when docked vertically
175,35, // when floated
false, // the bar is not fixed-size
4, // vertical gap (bar border)
4 // horizontal gap (bar border)
);
cbDimInfo sizes1( 150,35, // when docked horizontally
150,85, // when docked vertically
175,35, // when floated
);
cbDimInfo sizes1( 150,35, // when docked horizontally
150,85, // when docked vertically
175,35, // when floated
true, // the bar is not fixed-size
4, // vertical gap (bar border)
4 // horizontal gap (bar border)
);
cbDimInfo sizes2( 195,35, // when docked horizontally
185,37, // when docked vertically
195,35, // when floated
);
cbDimInfo sizes2( 195,35, // when docked horizontally
185,37, // when docked vertically
195,35, // when floated
true, // the bar is not fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
);
mpLayout->AddBar( CreateTextCtrl(_("Hello")), // bar window
sizes0, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
@@ -192,7 +192,7 @@ MyFrame::MyFrame(wxFrame *frame)
_("InfoViewer1"), // name to refer in customization pop-ups
true
);
mpLayout->AddBar( CreateTextCtrl(_("Bye")), // bar window
sizes0, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
1, // insert into 0th row (vert. position)
@@ -200,7 +200,7 @@ MyFrame::MyFrame(wxFrame *frame)
_("InfoViewer2"), // name to refer in customization pop-ups
true
);
mpLayout->AddBar( CreateTextCtrl(_("Fixed0")), // bar window
sizes1, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
@@ -208,11 +208,11 @@ MyFrame::MyFrame(wxFrame *frame)
_("ToolBar1"), // name to refer in customization pop-ups
true
);
wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
pToolBar->Create( this, wxID_ANY );
// 1001-1006 ids of command events fired by added tool-buttons
pToolBar->AddTool( 1001, wxString(wxT(BMP_DIR)) + wxT("new.bmp") );
@@ -220,13 +220,13 @@ MyFrame::MyFrame(wxFrame *frame)
pToolBar->AddTool( 1002, wxString(wxT(BMP_DIR)) + wxT("open.bmp") );
pToolBar->AddTool( 1003, wxString(wxT(BMP_DIR)) + wxT("save.bmp") );
#if wxUSE_STATLINE
pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));
pToolBar->AddSeparator(new wxMySeparatorLine(pToolBar, wxID_ANY));
#endif // wxUSE_STATLINE
pToolBar->AddTool( 1004, wxString(wxT(BMP_DIR)) + wxT("cut.bmp") );
pToolBar->AddTool( 1005, wxString(wxT(BMP_DIR)) + wxT("copy.bmp") );
pToolBar->AddTool( 1006, wxString(wxT(BMP_DIR)) + wxT("paste.bmp") );
mpLayout->AddBar( pToolBar, // bar window (can be NULL)
sizes2, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
@@ -234,13 +234,13 @@ MyFrame::MyFrame(wxFrame *frame)
wxT("ToolBar2"), // name to refer in customization pop-ups
false
);
mpLayout->EnableFloating( true ); // off, thinking about wxGtk...
}
MyFrame::~MyFrame()
{
if ( mpLayout)
if ( mpLayout)
delete mpLayout; // should be destroyed manually
}
@@ -260,7 +260,7 @@ void wxMySeparatorLine::DoSetSize( int x, int y,
y += (height - LINE_SIZE) / 2;
height = LINE_SIZE;
}
wxStaticLine::DoSetSize(x, y, width, height, sizeFlags);
}
#endif // wxUSE_STATLINE