#pragma hdrstop
#endif
-#include "wx/wx.h"
-
+#include "wx/app.h"
#include "wx/grid.h"
#include "wx/treectrl.h"
#include "wx/spinctrl.h"
#include "wx/wxhtml.h"
#include "wx/imaglist.h"
#include "wx/dataobj.h"
+#include "wx/dcclient.h"
+#include "wx/bmpbuttn.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/msgdlg.h"
+#include "wx/textdlg.h"
#include "wx/aui/aui.h"
#include "../sample.xpm"
ID_AllowActivePane,
ID_TransparentHint,
ID_TransparentHintFade,
+ ID_DisableVenetian,
+ ID_DisableVenetianFade,
ID_TransparentDrag,
ID_NoGradient,
ID_VerticalGradient,
};
-
// -- wxSizeReportCtrl --
// (a utility control that always reports it's client size)
END_EVENT_TABLE()
-
-
-
-
class SettingsPanel : public wxPanel
{
enum
END_EVENT_TABLE()
-
-
-
-
-
bool MyApp::OnInit()
{
wxFrame* frame = new MyFrame(NULL,
wxID_ANY,
- wxT("wxAUI 0.9.2 Test Application"),
+ wxT("wxAUI Sample Application"),
wxDefaultPosition,
wxSize(800, 600));
SetTopWindow(frame);
return true;
}
-
-
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground)
EVT_SIZE(MyFrame::OnSize)
EVT_MENU(ID_AllowFloating, MyFrame::OnManagerFlag)
EVT_MENU(ID_TransparentHint, MyFrame::OnManagerFlag)
EVT_MENU(ID_TransparentHintFade, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_DisableVenetian, MyFrame::OnManagerFlag)
+ EVT_MENU(ID_DisableVenetianFade, MyFrame::OnManagerFlag)
EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
EVT_MENU(ID_NoGradient, MyFrame::OnGradient)
EVT_UPDATE_UI(ID_AllowFloating, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_TransparentHint, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_TransparentHintFade, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_DisableVenetian, MyFrame::OnUpdateUI)
+ EVT_UPDATE_UI(ID_DisableVenetianFade, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
END_EVENT_TABLE()
-
MyFrame::MyFrame(wxWindow* parent,
wxWindowID id,
const wxString& title,
options_menu->AppendCheckItem(ID_AllowFloating, _("Allow Floating"));
options_menu->AppendCheckItem(ID_TransparentHint, _("Transparent Hint"));
options_menu->AppendCheckItem(ID_TransparentHintFade, _("Transparent Hint Fade-in"));
+ options_menu->AppendCheckItem(ID_DisableVenetian, _("Disable Venetian Blinds Hint"));
+ options_menu->AppendCheckItem(ID_DisableVenetianFade, _("Disable Venetian Blinds Hint Fade-in"));
options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
options_menu->AppendSeparator();
tb1->Realize();
-
wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER);
tb2->SetToolBitmapSize(wxSize(16,16));
tb3->Realize();
-
wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
tb4->SetToolBitmapSize(wxSize(16,16));
CenterPane());
m_mgr.AddPane(CreateNotebook(), wxPaneInfo().Name(wxT("notebook_content")).
- CenterPane());
+ CenterPane().PaneBorder(false));
// add the toolbars to the manager
m_mgr.Update();
}
-
void MyFrame::OnEraseBackground(wxEraseEvent& event)
{
event.Skip();
m_mgr.Update();
}
-
void MyFrame::OnGradient(wxCommandEvent& event)
{
int gradient = 0;
case ID_TransparentDrag: flag = wxAUI_MGR_TRANSPARENT_DRAG; break;
case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
case ID_TransparentHintFade: flag = wxAUI_MGR_TRANSPARENT_HINT_FADE; break;
+ case ID_DisableVenetian: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS; break;
+ case ID_DisableVenetianFade: flag = wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE; break;
case ID_AllowActivePane: flag = wxAUI_MGR_ALLOW_ACTIVE_PANE; break;
}
m_mgr.SetFlags(m_mgr.GetFlags() ^ flag);
switch (event.GetId())
{
case ID_NoGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE ? true : false);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);
break;
case ID_VerticalGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL ? true : false);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);
break;
case ID_HorizontalGradient:
- event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL ? true : false);
+ event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);
break;
case ID_AllowFloating:
- event.Check(flags & wxAUI_MGR_ALLOW_FLOATING ? true : false);
+ event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);
break;
case ID_TransparentDrag:
- event.Check(flags & wxAUI_MGR_TRANSPARENT_DRAG ? true : false);
+ event.Check((flags & wxAUI_MGR_TRANSPARENT_DRAG) != 0);
break;
case ID_TransparentHint:
- event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT ? true : false);
+ event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0);
break;
case ID_TransparentHintFade:
- event.Check(flags & wxAUI_MGR_TRANSPARENT_HINT_FADE ? true : false);
+ event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT_FADE) != 0);
+ break;
+ case ID_DisableVenetian:
+ event.Check((flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS) != 0);
+ break;
+ case ID_DisableVenetianFade:
+ event.Check((flags & wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE) != 0);
break;
}
}
}
}
-
-
void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
wxT("wxAUI Test"));
- dlg.SetValue(wxString::Format(wxT("Perspective %d"), m_perspectives.GetCount()+1));
+ dlg.SetValue(wxString::Format(wxT("Perspective %u"), unsigned(m_perspectives.GetCount() + 1)));
if (dlg.ShowModal() != wxID_OK)
return;
void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
- Name(wxT("Test")).Caption(wxT("Grid")).
+ Name(wxT("Test")).Caption(wxT("HTML Control")).
Float().FloatingPosition(GetStartPosition()).
FloatingSize(wxSize(300,200)));
m_mgr.Update();
void MyFrame::OnChangeContentPane(wxCommandEvent& event)
{
- m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent ? true:false);
- m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent ? true:false);
- m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent ? true:false);
- m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent ? true:false);
- m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent ? true:false);
- m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent ? true:false);
+ m_mgr.GetPane(wxT("grid_content")).Show(event.GetId() == ID_GridContent);
+ m_mgr.GetPane(wxT("text_content")).Show(event.GetId() == ID_TextContent);
+ m_mgr.GetPane(wxT("tree_content")).Show(event.GetId() == ID_TreeContent);
+ m_mgr.GetPane(wxT("sizereport_content")).Show(event.GetId() == ID_SizeReportContent);
+ m_mgr.GetPane(wxT("html_content")).Show(event.GetId() == ID_HTMLContent);
+ m_mgr.GetPane(wxT("notebook_content")).Show(event.GetId() == ID_NotebookContent);
m_mgr.Update();
}
wxString text;
if (ctrl_text.Length() > 0)
text = ctrl_text;
- else
+ else
text.Printf(wxT("This is text box %d"), ++n);
return new wxTextCtrl(this,wxID_ANY, text,
wxAuiMultiNotebook* MyFrame::CreateNotebook()
{
wxAuiMultiNotebook* ctrl = new wxAuiMultiNotebook( this, wxID_ANY,
- wxDefaultPosition, wxSize(400,300) );
+ wxDefaultPosition, wxSize(400,300), wxNO_BORDER );
wxPanel *panel = new wxPanel( ctrl, wxID_ANY );
wxFlexGridSizer *flex = new wxFlexGridSizer( 2 );
flex->AddGrowableCol( 1 );
flex->Add( 5,5 ); flex->Add( 5,5 );
flex->Add( new wxStaticText( panel, -1, wxT("wxTextCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
- flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1) ),
+ flex->Add( new wxTextCtrl( panel, -1, wxT(""), wxDefaultPosition, wxSize(100,-1)),
1, wxALL|wxALIGN_CENTRE, 5 );
flex->Add( new wxStaticText( panel, -1, wxT("wxSpinCtrl:") ), 0, wxALL|wxALIGN_CENTRE, 5 );
flex->Add( new wxSpinCtrl( panel, -1, wxT("5"), wxDefaultPosition, wxSize(100,-1),
ctrl->AddPage( panel, wxT("wxPanel") );
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some text"),
- wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE) , wxT("wxTextCtrl I") );
+ wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl I") );
ctrl->AddPage( new wxTextCtrl( ctrl, wxID_ANY, wxT("Some more text"),
- wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE) , wxT("wxTextCtrl II") );
+ wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER) , wxT("wxTextCtrl II") );
return ctrl;
}
{
const char* text =
"<html><body>"
- "<h3>Welcome to wxAUI 0.9.2</h3>"
+ "<h3>Welcome to wxAUI</h3>"
"<br/><b>Overview</b><br/>"
"<p>wxAUI is an Advanced User Interface library for the wxWidgets toolkit "
"that allows developers to create high-quality, cross-platform user "
"interfaces quickly and easily.</p>"
"<p><b>Features</b></p>"
- "<p>With wxAUI version 0.9.2, developers can create application frameworks with:</p>"
+ "<p>With wxAUI, developers can create application frameworks with:</p>"
"<ul>"
"<li>Native, dockable floating frames</li>"
"<li>Perspective saving and loading</li>"
projects / wxWidgets.git / blobdiff