added test for changing toolbar on the fly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
93840b31b9
commit
7fb233050c
@ -42,7 +42,7 @@ IMPLEMENT_APP(MyApp)
|
||||
|
||||
// The `main program' equivalent, creating the windows and returning the
|
||||
// main frame
|
||||
bool MyApp::OnInit(void)
|
||||
bool MyApp::OnInit()
|
||||
{
|
||||
// Create the main frame window
|
||||
MyFrame* frame = new MyFrame((wxFrame *) NULL, -1, (const wxString) "wxToolBar Sample",
|
||||
@ -55,6 +55,11 @@ bool MyApp::OnInit(void)
|
||||
frame->SetIcon(wxICON(mondrian));
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *tbarMenu = new wxMenu;
|
||||
tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBAR, "&Toggle toolbar", "Change the toolbar kind");
|
||||
tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button", "");
|
||||
tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button", "");
|
||||
|
||||
wxMenu *fileMenu = new wxMenu;
|
||||
fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
|
||||
|
||||
@ -64,6 +69,7 @@ bool MyApp::OnInit(void)
|
||||
wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
|
||||
|
||||
menuBar->Append(fileMenu, "&File");
|
||||
menuBar->Append(tbarMenu, "&Toolbar");
|
||||
menuBar->Append(helpMenu, "&Help");
|
||||
|
||||
// Associate the menu bar with the frame
|
||||
@ -89,7 +95,7 @@ bool MyApp::OnInit(void)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool MyApp::InitToolbar(wxToolBar* toolBar)
|
||||
bool MyApp::InitToolbar(wxToolBar* toolBar, bool small)
|
||||
{
|
||||
// Set up toolbar
|
||||
wxBitmap* toolBarBitmaps[8];
|
||||
@ -97,22 +103,27 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
|
||||
#ifdef __WXMSW__
|
||||
toolBarBitmaps[0] = new wxBitmap("icon1");
|
||||
toolBarBitmaps[1] = new wxBitmap("icon2");
|
||||
if ( !small )
|
||||
{
|
||||
toolBarBitmaps[2] = new wxBitmap("icon3");
|
||||
toolBarBitmaps[3] = new wxBitmap("icon4");
|
||||
toolBarBitmaps[4] = new wxBitmap("icon5");
|
||||
toolBarBitmaps[5] = new wxBitmap("icon6");
|
||||
toolBarBitmaps[6] = new wxBitmap("icon7");
|
||||
toolBarBitmaps[7] = new wxBitmap("icon8");
|
||||
}
|
||||
#else
|
||||
toolBarBitmaps[0] = new wxBitmap( new_xpm );
|
||||
toolBarBitmaps[1] = new wxBitmap( open_xpm );
|
||||
if ( !small )
|
||||
{
|
||||
toolBarBitmaps[2] = new wxBitmap( save_xpm );
|
||||
toolBarBitmaps[3] = new wxBitmap( copy_xpm );
|
||||
toolBarBitmaps[4] = new wxBitmap( cut_xpm );
|
||||
// toolBarBitmaps[5] = new wxBitmap( paste_xpm );
|
||||
toolBarBitmaps[5] = new wxBitmap( preview_xpm );
|
||||
toolBarBitmaps[6] = new wxBitmap( print_xpm );
|
||||
toolBarBitmaps[7] = new wxBitmap( help_xpm );
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __WXMSW__
|
||||
@ -125,6 +136,9 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
|
||||
toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");
|
||||
currentX += width + 5;
|
||||
toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");
|
||||
|
||||
if ( !small )
|
||||
{
|
||||
currentX += width + 5;
|
||||
toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file");
|
||||
currentX += width + 5;
|
||||
@ -142,12 +156,13 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
|
||||
toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), *(toolBarBitmaps[6]), TRUE, currentX, -1, (wxObject *) NULL, "Help");
|
||||
|
||||
toolBar->EnableTool( wxID_PRINT, FALSE );
|
||||
}
|
||||
|
||||
toolBar->Realize();
|
||||
|
||||
// Can delete the bitmaps since they're reference counted
|
||||
int i;
|
||||
for (i = 0; i < 8; i++)
|
||||
int i, max = small ? 2 : WXSIZEOF(toolBarBitmaps);
|
||||
for (i = 0; i < max; i++)
|
||||
delete toolBarBitmaps[i];
|
||||
|
||||
return TRUE;
|
||||
@ -158,17 +173,36 @@ bool MyApp::InitToolbar(wxToolBar* toolBar)
|
||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
|
||||
EVT_MENU(wxID_HELP, MyFrame::OnAbout)
|
||||
EVT_CLOSE(MyFrame::OnCloseWindow)
|
||||
|
||||
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBAR, OnToggleToolbar)
|
||||
EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, OnEnablePrint)
|
||||
EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, OnToggleHelp)
|
||||
|
||||
EVT_MENU(-1, MyFrame::OnToolLeftClick)
|
||||
EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// Define my frame constructor
|
||||
MyFrame::MyFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos,
|
||||
const wxSize& size, long style):
|
||||
wxFrame(parent, id, title, pos, size, style)
|
||||
MyFrame::MyFrame(wxFrame* parent,
|
||||
wxWindowID id,
|
||||
const wxString& title,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style)
|
||||
: wxFrame(parent, id, title, pos, size, style)
|
||||
{
|
||||
m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
|
||||
m_smallToolbar = FALSE;
|
||||
}
|
||||
|
||||
void MyFrame::OnToggleToolbar(wxCommandEvent& event)
|
||||
{
|
||||
delete GetToolBar();
|
||||
SetToolBar(NULL);
|
||||
CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT|wxTB_DOCKABLE, ID_TOOLBAR);
|
||||
|
||||
m_smallToolbar = !m_smallToolbar;
|
||||
wxGetApp().InitToolbar(GetToolBar(), m_smallToolbar);
|
||||
}
|
||||
|
||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||
@ -181,13 +215,6 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
(void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
|
||||
}
|
||||
|
||||
// Define the behaviour for the frame closing
|
||||
// - must delete all frames except for the main one.
|
||||
void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
|
||||
{
|
||||
Destroy();
|
||||
}
|
||||
|
||||
void MyFrame::OnToolLeftClick(wxCommandEvent& event)
|
||||
{
|
||||
wxString str;
|
||||
@ -203,6 +230,17 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
|
||||
}
|
||||
|
||||
if (event.GetId() == wxID_COPY)
|
||||
{
|
||||
DoEnablePrint();
|
||||
}
|
||||
|
||||
if (event.GetId() == wxID_CUT)
|
||||
{
|
||||
DoToggleHelp();
|
||||
}
|
||||
}
|
||||
|
||||
void MyFrame::DoEnablePrint()
|
||||
{
|
||||
wxToolBar *tb = GetToolBar();
|
||||
if (tb->GetToolEnabled(wxID_PRINT))
|
||||
@ -211,12 +249,11 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
|
||||
tb->EnableTool( wxID_PRINT, TRUE );
|
||||
}
|
||||
|
||||
if (event.GetId() == wxID_CUT)
|
||||
void MyFrame::DoToggleHelp()
|
||||
{
|
||||
wxToolBar *tb = GetToolBar();
|
||||
tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
|
||||
}
|
||||
}
|
||||
|
||||
void MyFrame::OnToolEnter(wxCommandEvent& event)
|
||||
{
|
||||
|
@ -13,40 +13,50 @@
|
||||
class MyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
bool OnInit(void);
|
||||
bool InitToolbar(wxToolBar* toolBar);
|
||||
};
|
||||
|
||||
class MyTimer : public wxTimer
|
||||
{
|
||||
public:
|
||||
MyTimer(wxFrame *frame) { m_frame = frame; }
|
||||
|
||||
virtual void Notify() { wxLogStatus(m_frame, _T("Timer arrived!") ); }
|
||||
|
||||
private:
|
||||
wxFrame *m_frame;
|
||||
bool OnInit();
|
||||
bool InitToolbar(wxToolBar* toolBar, bool small = FALSE);
|
||||
};
|
||||
|
||||
// Define a new frame
|
||||
class MyFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
MyFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
MyFrame(wxFrame *parent,
|
||||
wxWindowID id = -1,
|
||||
const wxString& title = "wxToolBar Sample",
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME_STYLE);
|
||||
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
|
||||
void OnToggleToolbar(wxCommandEvent& event);
|
||||
void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); }
|
||||
void OnToggleHelp(wxCommandEvent& event) { DoToggleHelp(); }
|
||||
|
||||
void OnToolLeftClick(wxCommandEvent& event);
|
||||
void OnToolEnter(wxCommandEvent& event);
|
||||
|
||||
private:
|
||||
void DoEnablePrint();
|
||||
void DoToggleHelp();
|
||||
|
||||
bool m_smallToolbar;
|
||||
wxTextCtrl* m_textWindow;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#define ID_TOOLBAR 500
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
const int ID_TOOLBAR = 500;
|
||||
|
||||
enum
|
||||
{
|
||||
IDM_TOOLBAR_TOGGLETOOLBAR = 200,
|
||||
IDM_TOOLBAR_ENABLEPRINT,
|
||||
IDM_TOOLBAR_TOGGLEHELP
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user