// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#include <wx/toolbar.h>
#include <wx/log.h>
+#include <wx/image.h>
+#include <wx/spinctrl.h>
+
+// define this to 1 to use wxToolBarSimple instead of the native one
+#define USE_GENERIC_TBAR 0
+
+// define this to use XPMs everywhere (by default, BMPs are used under Win)
+#ifdef __WXMSW__
+ #define USE_XPM_BITMAPS 0
+#else
+ #define USE_XPM_BITMAPS 1
+#endif
+
+#if USE_GENERIC_TBAR
+ #if !wxUSE_TOOLBAR_SIMPLE
+ #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
+ to 1 in setup.h and recompile the library.
+ #else
+ #include <wx/tbarsmpl.h>
+ #endif
+#endif // USE_GENERIC_TBAR
+
+#if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
+ #error You need to enable XPM support to use XPM bitmaps with toolbar!
+#endif // USE_XPM_BITMAPS
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if USE_XPM_BITMAPS
#include "mondrian.xpm"
#include "bitmaps/new.xpm"
#include "bitmaps/open.xpm"
#include "bitmaps/preview.xpm" // paste XPM
#include "bitmaps/print.xpm"
#include "bitmaps/help.xpm"
-#endif // GTK or Motif
+#endif // USE_XPM_BITMAPS
// ----------------------------------------------------------------------------
// classes
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
+ void OnSize(wxSizeEvent& event);
+
+ void OnToggleAnotherToolbar(wxCommandEvent& event);
+
void OnToggleToolbarSize(wxCommandEvent& event);
void OnToggleToolbarOrient(wxCommandEvent& event);
void OnToggleToolbarRows(wxCommandEvent& event);
- void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); }
- void OnDeletePrint(wxCommandEvent& event) { DoDeletePrint(); }
+ void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); }
+ void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); }
void OnInsertPrint(wxCommandEvent& event);
- void OnToggleHelp(wxCommandEvent& event) { DoToggleHelp(); }
+ void OnChangeToolTip(wxCommandEvent& event);
+ void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }
+
+ void OnToolbarStyle(wxCommandEvent& event);
void OnToolLeftClick(wxCommandEvent& event);
void OnToolEnter(wxCommandEvent& event);
void OnUpdateCopyAndCut(wxUpdateUIEvent& event);
+#if USE_GENERIC_TBAR
+ virtual wxToolBar *OnCreateToolBar(long style,
+ wxWindowID id,
+ const wxString& name );
+#endif // USE_GENERIC_TBAR
+
private:
void DoEnablePrint();
void DoDeletePrint();
void DoToggleHelp();
+ void LayoutChildren();
+
bool m_smallToolbar,
m_horzToolbar;
size_t m_rows; // 1 or 2 only
- wxTextCtrl* m_textWindow;
+ wxTextCtrl *m_textWindow;
+
+ wxToolBar *m_tbar;
DECLARE_EVENT_TABLE()
};
const int ID_TOOLBAR = 500;
+static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT ;
+// static const long TOOLBAR_STYLE = 0;
+
enum
{
IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
IDM_TOOLBAR_DELETEPRINT,
IDM_TOOLBAR_INSERTPRINT,
IDM_TOOLBAR_TOGGLEHELP,
+ IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
+ IDM_TOOLBAR_CHANGE_TOOLTIP,
+ IDM_TOOLBAR_SHOW_TEXT,
+ IDM_TOOLBAR_SHOW_ICONS,
+ IDM_TOOLBAR_SHOW_BOTH,
ID_COMBO = 1000
};
// help button.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+ EVT_SIZE(MyFrame::OnSize)
+
EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
EVT_MENU(wxID_HELP, MyFrame::OnAbout)
+ EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
+
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARORIENT, MyFrame::OnToggleToolbarOrient)
EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)
EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
+ EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
+
+ EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
+ MyFrame::OnToolbarStyle)
EVT_MENU(-1, MyFrame::OnToolLeftClick)
// Create the main frame window
MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
"wxToolBar Sample",
- wxPoint(100, 100), wxSize(450, 300));
+ wxPoint(100, 100), wxSize(550, 300));
frame->Show(TRUE);
void MyFrame::RecreateToolbar()
{
// delete and recreate the toolbar
- wxToolBar *toolBar = GetToolBar();
+ wxToolBarBase *toolBar = GetToolBar();
+ long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
+
delete toolBar;
SetToolBar(NULL);
- long style = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE;
+ style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL);
style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
toolBar = CreateToolBar(style, ID_TOOLBAR);
- toolBar->SetMargins( 4, 4 );
+ //toolBar->SetMargins( 4, 4 );
// Set up toolbar
wxBitmap toolBarBitmaps[8];
+#if USE_XPM_BITMAPS
+ toolBarBitmaps[0] = wxBitmap(new_xpm);
+ toolBarBitmaps[1] = wxBitmap(open_xpm);
+ toolBarBitmaps[2] = wxBitmap(save_xpm);
+ toolBarBitmaps[3] = wxBitmap(copy_xpm);
+ toolBarBitmaps[4] = wxBitmap(cut_xpm);
+ toolBarBitmaps[5] = wxBitmap(paste_xpm);
+ toolBarBitmaps[6] = wxBitmap(print_xpm);
+ toolBarBitmaps[7] = wxBitmap(help_xpm);
+#else // !USE_XPM_BITMAPS
toolBarBitmaps[0] = wxBITMAP(new);
toolBarBitmaps[1] = wxBITMAP(open);
+ toolBarBitmaps[2] = wxBITMAP(save);
+ toolBarBitmaps[3] = wxBITMAP(copy);
+ toolBarBitmaps[4] = wxBITMAP(cut);
+ toolBarBitmaps[5] = wxBITMAP(paste);
+ toolBarBitmaps[6] = wxBITMAP(print);
+ toolBarBitmaps[7] = wxBITMAP(help);
+#endif // USE_XPM_BITMAPS/!USE_XPM_BITMAPS
+
if ( !m_smallToolbar )
{
- toolBarBitmaps[2] = wxBITMAP(save);
- toolBarBitmaps[3] = wxBITMAP(copy);
- toolBarBitmaps[4] = wxBITMAP(cut);
- toolBarBitmaps[5] = wxBITMAP(paste);
- toolBarBitmaps[6] = wxBITMAP(print);
- toolBarBitmaps[7] = wxBITMAP(help);
+ int w = 2*toolBarBitmaps[0].GetWidth(),
+ h = 2*toolBarBitmaps[0].GetHeight();
+ for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ )
+ {
+ toolBarBitmaps[n] =
+ wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
+ }
+
+ toolBar->SetToolBitmapSize(wxSize(w, h));
}
-#ifdef __WXMSW__
- int width = 24;
-#else
- int width = 16;
-#endif
-
- int currentX = 5;
-
- 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");
+ toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[0], _T("New file"));
+ toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[1], _T("Open file"));
+ // neither the generic nor Motif native toolbars really support this
+#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) && !defined(__WXX11__)
// adding a combo to a vertical toolbar is not very smart
if ( m_horzToolbar )
{
- wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO);
+ wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, "", wxDefaultPosition, wxSize(200,-1) );
combo->Append("This");
combo->Append("is a");
combo->Append("combobox");
combo->Append("toolbar");
toolBar->AddControl(combo);
}
+#endif // toolbars which don't support controls
- if ( !m_smallToolbar )
- {
- currentX += width + 5;
- toolBar->AddTool(wxID_SAVE, toolBarBitmaps[2], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
- currentX += width + 5;
- toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 2");
- currentX += width + 5;
- toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Toggle/Untoggle help button");
- currentX += width + 5;
- toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste");
- currentX += width + 5;
- toolBar->AddTool(wxID_PRINT, toolBarBitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Delete this tool");
- currentX += width + 5;
- toolBar->AddSeparator();
- toolBar->AddTool(wxID_HELP, toolBarBitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help button");
- }
+ toolBar->AddTool(wxID_SAVE, _T("Save"), toolBarBitmaps[2], _T("Toggle button 1"), wxITEM_CHECK);
+ toolBar->AddTool(wxID_COPY, _T("Copy"), toolBarBitmaps[3], _T("Toggle button 2"), wxITEM_CHECK);
+ toolBar->AddTool(wxID_CUT, _T("Cut"), toolBarBitmaps[4], _T("Toggle/Untoggle help button"));
+ toolBar->AddTool(wxID_PASTE, _T("Paste"), toolBarBitmaps[5], _T("Paste"));
+ toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[6], _T("Delete this tool"));
+ toolBar->AddSeparator();
+ toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[7], _T("Help button"), wxITEM_CHECK);
// after adding the buttons to the toolbar, must call Realize() to reflect
// the changes
long style)
: wxFrame(parent, id, title, pos, size, style)
{
+ m_tbar = NULL;
m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
- m_smallToolbar = FALSE;
+ m_smallToolbar = TRUE;
m_horzToolbar = TRUE;
m_rows = 1;
// Make a menubar
wxMenu *tbarMenu = new wxMenu;
+ tbarMenu->Append(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
+ "Toggle &another toolbar\tCtrl-A",
+ "Show/hide another test toolbar",
+ TRUE);
+
tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBARSIZE,
"&Toggle toolbar size\tCtrl-S",
"Toggle between big/small toolbar",
tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button\tCtrl-D", "");
tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button\tCtrl-I", "");
tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button\tCtrl-T", "");
+ tbarMenu->AppendSeparator();
+ tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, "Change tool tip", "");
+ tbarMenu->AppendSeparator();
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, "Show &text\tAlt-T");
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, "Show &icons\tAlt-I");
+ tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, "Show &both\tAlt-B");
wxMenu *fileMenu = new wxMenu;
- fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
+ fileMenu->Append(wxID_EXIT, "E&xit\tAlt-X", "Quit toolbar sample" );
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(wxID_HELP, "&About", "About toolbar sample");
// Associate the menu bar with the frame
SetMenuBar(menuBar);
+ menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, TRUE);
+
// Create the toolbar
RecreateToolbar();
}
+#if USE_GENERIC_TBAR
+
+wxToolBar* MyFrame::OnCreateToolBar(long style,
+ wxWindowID id,
+ const wxString& name)
+{
+ return (wxToolBar *)new wxToolBarSimple(this, id,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
+}
+
+#endif // USE_GENERIC_TBAR
+
+void MyFrame::LayoutChildren()
+{
+ wxSize size = GetClientSize();
+
+ int offset;
+ if ( m_tbar )
+ {
+ m_tbar->SetSize(-1, size.y);
+ m_tbar->Move(0, 0);
+
+ offset = m_tbar->GetSize().x;
+ }
+ else
+ {
+ offset = 0;
+ }
+
+ m_textWindow->SetSize(offset, 0, size.x - offset, size.y);
+}
+
+void MyFrame::OnSize(wxSizeEvent& event)
+{
+ if ( m_tbar )
+ {
+ LayoutChildren();
+ }
+ else
+ {
+ event.Skip();
+ }
+}
+
+void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
+{
+ if ( m_tbar )
+ {
+ delete m_tbar;
+ m_tbar = NULL;
+ }
+ else
+ {
+ long style = GetToolBar()->GetWindowStyle();
+ style &= ~wxTB_HORIZONTAL;
+ style |= wxTB_VERTICAL;
+
+ m_tbar = new wxToolBar(this, -1,
+ wxDefaultPosition, wxDefaultSize,
+ style);
+
+ m_tbar->AddRadioTool(wxID_NEW, _T("First"), wxBITMAP(new));
+ m_tbar->AddRadioTool(wxID_OPEN, _T("Second"), wxBITMAP(open));
+ m_tbar->AddRadioTool(wxID_SAVE, _T("Third"), wxBITMAP(save));
+ m_tbar->AddSeparator();
+ m_tbar->AddTool(wxID_HELP, _T("Help"), wxBITMAP(help));
+
+ m_tbar->Realize();
+ }
+
+ LayoutChildren();
+}
+
void MyFrame::OnToggleToolbarSize(wxCommandEvent& WXUNUSED(event))
{
m_smallToolbar = !m_smallToolbar;
GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
- //RecreateToolbar();
+ //RecreateToolbar(); -- this is unneeded
}
void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
void MyFrame::DoEnablePrint()
{
- wxToolBar *tb = GetToolBar();
+ wxToolBarBase *tb = GetToolBar();
if (tb->GetToolEnabled(wxID_PRINT))
tb->EnableTool( wxID_PRINT, FALSE );
else
void MyFrame::DoDeletePrint()
{
- wxToolBar *tb = GetToolBar();
+ wxToolBarBase *tb = GetToolBar();
tb->DeleteTool( wxID_PRINT );
}
void MyFrame::DoToggleHelp()
{
- wxToolBar *tb = GetToolBar();
+ wxToolBarBase *tb = GetToolBar();
tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
}
event.Enable( m_textWindow->CanCopy() );
}
+void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
+{
+ GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button"));
+}
+
+void MyFrame::OnToolbarStyle(wxCommandEvent& event)
+{
+ long style = GetToolBar()->GetWindowStyle();
+ style &= ~(wxTB_NOICONS | wxTB_TEXT);
+
+ switch ( event.GetId() )
+ {
+ case IDM_TOOLBAR_SHOW_TEXT:
+ style |= wxTB_NOICONS | wxTB_TEXT;
+ break;
+
+ case IDM_TOOLBAR_SHOW_ICONS:
+ // nothing to do
+ break;
+
+ case IDM_TOOLBAR_SHOW_BOTH:
+ style |= wxTB_TEXT;
+ }
+
+ GetToolBar()->SetWindowStyle(style);
+}
+
void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
{
wxBitmap bmp = wxBITMAP(print);
void MyFrame::OnToolEnter(wxCommandEvent& event)
{
- if (event.GetSelection() > -1)
- {
- wxString str;
- str.Printf(_T("This is tool number %d"), event.GetSelection());
- SetStatusText(str);
- }
- else
- SetStatusText("");
+ if (event.GetSelection() > -1)
+ {
+ wxString str;
+ str.Printf(_T("This is tool number %d"), event.GetSelection());
+ SetStatusText(str);
+ }
+ else
+ SetStatusText("");
}
projects / wxWidgets.git / blobdiff