]> git.saurik.com Git - wxWidgets.git/commitdiff
updated the sample and renamed the files
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 13 Dec 1999 23:05:56 +0000 (23:05 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 13 Dec 1999 23:05:56 +0000 (23:05 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 files changed:
samples/toolbar/Makefile.in
samples/toolbar/makefile.b32
samples/toolbar/makefile.bcc
samples/toolbar/makefile.dos
samples/toolbar/makefile.g95
samples/toolbar/makefile.vc
samples/toolbar/makefile.wat
samples/toolbar/test.cpp [deleted file]
samples/toolbar/test.def [deleted file]
samples/toolbar/test.rc [deleted file]
samples/toolbar/toolbar.cpp [new file with mode: 0644]
samples/toolbar/toolbar.def [new file with mode: 0644]
samples/toolbar/toolbar.rc [new file with mode: 0644]

index 9ae0fa71c7ec63a8710f6fca392b94cd4bb898e3..0d69e480ec379ec853f8b69a9c115ffb87b32d38 100644 (file)
@@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@
 top_builddir = ../..
 program_dir = samples/toolbar
 
-PROGRAM=test
+PROGRAM=toolbar
 
 OBJECTS=$(PROGRAM).o
 
index 95ddc80d76f728d37352e263489f8c331912bab8..1645915c3a160d9a39f7a3018e203c6ab93b3b32 100644 (file)
@@ -9,7 +9,7 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=test
+TARGET=toolbar
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
index 669f01905aefc544ba0a51607dfa612d1f849b50..3694771dd1600054daa2b46be2513488f59b8019 100644 (file)
@@ -12,7 +12,7 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=test
+TARGET=toolbar
 OBJECTS=$(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.bcc
index 13e3a4ce8eeef60898c11fc6c1f1a9e8f12374bd..c98a1b1f01359829b6547ec4f205726fd8a7dfe4 100644 (file)
@@ -10,7 +10,7 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=test
+TARGET=toolbar
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.msc
index b4a920f047f4d2d08d871efbbb5cc0cf207b6327..d011eb9db7534e511ffd7222406fefd927c2ef62 100644 (file)
@@ -9,7 +9,7 @@
 
 WXDIR = ../..
 
-TARGET=test
+TARGET=toolbar
 OBJECTS = $(TARGET).o
 
 include $(WXDIR)/src/makeprog.g95
index 4ada748edad53c6917114d10b0dcd373f6ba8648..bbff798ce4c3cbf03410ffe8de4141f8cd6f592e 100644 (file)
@@ -11,7 +11,7 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-PROGRAM=test
+PROGRAM=toolbar
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc
index 81a83e42a9fbbe144c5dfef0f52fae312124c84f..8c27bfb8a961914d3c6a1342b8ff42dca46e47f4 100644 (file)
@@ -7,7 +7,7 @@
 
 WXDIR = $(%WXWIN)
 
-PROGRAM = test
+PROGRAM = toolbar
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.wat
diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
deleted file mode 100644 (file)
index 84aeb13..0000000
+++ /dev/null
@@ -1,421 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
-// Purpose:     wxToolBar sample
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
-
-#include <wx/toolbar.h>
-#include <wx/log.h>
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #include "mondrian.xpm"
-    #include "bitmaps/new.xpm"
-    #include "bitmaps/open.xpm"
-    #include "bitmaps/save.xpm"
-    #include "bitmaps/copy.xpm"
-    #include "bitmaps/cut.xpm"
-    // #include "bitmaps/paste.xpm"
-    #include "bitmaps/print.xpm"
-    #include "bitmaps/preview.xpm"
-    #include "bitmaps/help.xpm"
-#endif // GTK or Motif
-
-// ----------------------------------------------------------------------------
-// classes
-// ----------------------------------------------------------------------------
-
-// Define a new application
-class MyApp: public wxApp
-{
-public:
-    bool OnInit();
-    bool InitToolbar(wxToolBar* toolBar, bool smallicons = 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,
-            long style = wxDEFAULT_FRAME_STYLE);
-
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-    void OnToggleToolbar(wxCommandEvent& event);
-    void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); }
-    void OnDeletePrint(wxCommandEvent& event) { DoDeletePrint(); }
-    void OnInsertPrint(wxCommandEvent& event);
-    void OnToggleHelp(wxCommandEvent& event) { DoToggleHelp(); }
-
-    void OnToolLeftClick(wxCommandEvent& event);
-    void OnToolEnter(wxCommandEvent& event);
-
-    void OnCombo(wxCommandEvent& event);
-
-private:
-    void DoEnablePrint();
-    void DoDeletePrint();
-    void DoToggleHelp();
-
-    bool                m_smallToolbar;
-    wxTextCtrl*         m_textWindow;
-
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-const int ID_TOOLBAR = 500;
-
-enum
-{
-    IDM_TOOLBAR_TOGGLETOOLBAR = 200,
-    IDM_TOOLBAR_ENABLEPRINT,
-    IDM_TOOLBAR_DELETEPRINT,
-    IDM_TOOLBAR_INSERTPRINT,
-    IDM_TOOLBAR_TOGGLEHELP,
-
-    ID_COMBO = 1000
-};
-
-// ----------------------------------------------------------------------------
-// event tables
-// ----------------------------------------------------------------------------
-
-// Notice that wxID_HELP will be processed for the 'About' menu and the toolbar
-// help button.
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
-    EVT_MENU(wxID_HELP, MyFrame::OnAbout)
-
-    EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBAR, MyFrame::OnToggleToolbar)
-    EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)
-    EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
-    EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
-    EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
-
-    EVT_MENU(-1, MyFrame::OnToolLeftClick)
-
-    EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
-
-    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// MyApp
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_APP(MyApp)
-
-// The `main program' equivalent, creating the windows and returning the
-// main frame
-bool MyApp::OnInit()
-{
-    // Create the main frame window
-    MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
-                                 "wxToolBar Sample",
-                                 wxPoint(100, 100), wxSize(450, 300));
-
-    // VZ: what's this for??
-#if 0
-    // Force a resize. This should probably be replaced by a call to a wxFrame
-    // function that lays out default decorations and the remaining content window.
-    wxSizeEvent event(wxSize(-1, -1), frame->GetId());
-    frame->OnSize(event);
-#endif // 0
-
-    frame->Show(TRUE);
-
-    frame->SetStatusText("Hello, wxWindows");
-
-    SetTopWindow(frame);
-
-    return TRUE;
-}
-
-bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
-{
-  // Set up toolbar
-  wxBitmap* toolBarBitmaps[8];
-
-#ifdef __WXMSW__
-  toolBarBitmaps[0] = new wxBitmap("icon1");
-  toolBarBitmaps[1] = new wxBitmap("icon2");
-  if ( !smallicons )
-  {
-      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 ( !smallicons )
-  {
-      toolBarBitmaps[2] = new wxBitmap( save_xpm );
-      toolBarBitmaps[3] = new wxBitmap( copy_xpm );
-      toolBarBitmaps[4] = new wxBitmap( cut_xpm );
-      toolBarBitmaps[5] = new wxBitmap( preview_xpm );
-      toolBarBitmaps[6] = new wxBitmap( print_xpm );
-      toolBarBitmaps[7] = new wxBitmap( help_xpm );
-  }
-#endif
-
-#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");
-  currentX += width + 5;
-  toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
-
-  wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO);
-  combo->Append("This");
-  combo->Append("is a");
-  combo->Append("combobox");
-  combo->Append("in a");
-  combo->Append("toolbar");
-  toolBar->AddControl(combo);
-
-  if ( !smallicons )
-  {
-      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->Realize();
-
-  // Can delete the bitmaps since they're reference counted
-  int i, max = smallicons ? 3 : WXSIZEOF(toolBarBitmaps);
-  for (i = 0; i < max; i++)
-    delete toolBarBitmaps[i];
-
-  return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// MyFrame
-// ----------------------------------------------------------------------------
-
-// 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)
-{
-    m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
-    m_smallToolbar = FALSE;
-
-    // Give it a status line
-    CreateStatusBar();
-
-    // Give it an icon
-    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_DELETEPRINT, "&Delete print button", "");
-    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button", "");
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button", "");
-
-    wxMenu *fileMenu = new wxMenu;
-    fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
-
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_HELP, "&About", "About toolbar sample");
-
-    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
-    SetMenuBar(menuBar);
-
-    // Create the toolbar
-    wxToolBar *tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL |
-                                    wxTB_FLAT | wxTB_DOCKABLE,
-                                    ID_TOOLBAR);
-
-    tbar->SetMargins( 4, 4 );
-
-    wxGetApp().InitToolbar(tbar);
-}
-
-void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event))
-{
-    // delete and recreate the toolbar
-    wxToolBar *tbar = GetToolBar();
-    delete tbar;
-
-    SetToolBar(NULL);
-    tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL |
-                         wxTB_FLAT | wxTB_DOCKABLE,
-                         ID_TOOLBAR);
-
-    m_smallToolbar = !m_smallToolbar;
-    wxGetApp().InitToolbar(tbar, m_smallToolbar);
-}
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(TRUE);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
-}
-
-void MyFrame::OnToolLeftClick(wxCommandEvent& event)
-{
-    wxString str;
-    str.Printf( _T("Clicked on tool %d\n"), event.GetId());
-    m_textWindow->WriteText( str );
-
-    if (event.GetId() == wxID_HELP)
-    {
-        if ( event.GetExtraLong() != 0 )
-            m_textWindow->WriteText( _T("Help button down now.\n") );
-        else
-            m_textWindow->WriteText( _T("Help button up now.\n") );
-    }
-
-    if (event.GetId() == wxID_COPY)
-    {
-        DoEnablePrint();
-    }
-
-    if (event.GetId() == wxID_CUT)
-    {
-        DoToggleHelp();
-    }
-
-    if (event.GetId() == wxID_PRINT)
-    {
-        DoDeletePrint();
-    }
-}
-
-void MyFrame::OnCombo(wxCommandEvent& event)
-{
-    wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str());
-}
-
-void MyFrame::DoEnablePrint()
-{
-    wxToolBar *tb = GetToolBar();
-    if (tb->GetToolEnabled(wxID_PRINT))
-        tb->EnableTool( wxID_PRINT, FALSE );
-    else
-        tb->EnableTool( wxID_PRINT, TRUE );
-}
-
-void MyFrame::DoDeletePrint()
-{
-    wxToolBar *tb = GetToolBar();
-
-    // only implemented in wxGTK and wxMSW for now
-#if !defined(__WXGTK__) && !defined(__WXMSW__)
-    wxMessageBox("Sorry, wxToolBar::DeleteTool is not implemented.");
-#else
-    tb->DeleteTool( wxID_PRINT );
-#endif
-}
-
-void MyFrame::DoToggleHelp()
-{
-    wxToolBar *tb = GetToolBar();
-    tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
-}
-
-void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
-{
-#ifdef __WXMSW__
-    wxBitmap bmp("icon7");
-#else
-    wxBitmap bmp(print_xpm);
-#endif
-
-    GetToolBar()->AddTool(wxID_PRINT, bmp, wxNullBitmap,
-                          FALSE, 0, -1,
-                          (wxObject *) NULL, "Delete this tool");
-
-    GetToolBar()->Realize();
-}
-
-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("");
-}
-
diff --git a/samples/toolbar/test.def b/samples/toolbar/test.def
deleted file mode 100644 (file)
index 897b9da..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-NAME         ToolTest
-DESCRIPTION  'wxToolBar Sample'
-EXETYPE      WINDOWS
-STUB         'WINSTUB.EXE'
-CODE         PRELOAD MOVEABLE DISCARDABLE
-DATA         PRELOAD MOVEABLE MULTIPLE
-HEAPSIZE     1024
-STACKSIZE    8192
diff --git a/samples/toolbar/test.rc b/samples/toolbar/test.rc
deleted file mode 100644 (file)
index 6c9086d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-icon1 BITMAP "bitmaps/new.bmp"
-icon2 BITMAP "bitmaps/open.bmp"
-icon3 BITMAP "bitmaps/save.bmp"
-icon4 BITMAP "bitmaps/copy.bmp"
-icon5 BITMAP "bitmaps/cut.bmp"
-icon6 BITMAP "bitmaps/paste.bmp"
-icon7 BITMAP "bitmaps/print.bmp"
-
-icon8 BITMAP "bitmaps/help.bmp"
-
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
new file mode 100644 (file)
index 0000000..623e503
--- /dev/null
@@ -0,0 +1,415 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        toolbar.cpp
+// Purpose:     wxToolBar sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include <wx/wxprec.h>
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include <wx/wx.h>
+#endif
+
+#include <wx/toolbar.h>
+#include <wx/log.h>
+
+// ----------------------------------------------------------------------------
+// resources
+// ----------------------------------------------------------------------------
+
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    #include "mondrian.xpm"
+    #include "bitmaps/new.xpm"
+    #include "bitmaps/open.xpm"
+    #include "bitmaps/save.xpm"
+    #include "bitmaps/copy.xpm"
+    #include "bitmaps/cut.xpm"
+    // #include "bitmaps/paste.xpm"
+    #include "bitmaps/print.xpm"
+    #include "bitmaps/preview.xpm"
+    #include "bitmaps/help.xpm"
+#endif // GTK or Motif
+
+// ----------------------------------------------------------------------------
+// classes
+// ----------------------------------------------------------------------------
+
+// Define a new application
+class MyApp: public wxApp
+{
+public:
+    bool OnInit();
+    bool InitToolbar(wxToolBar* toolBar, bool smallicons = 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,
+            long style = wxDEFAULT_FRAME_STYLE);
+
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+
+    void OnToggleToolbar(wxCommandEvent& event);
+    void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); }
+    void OnDeletePrint(wxCommandEvent& event) { DoDeletePrint(); }
+    void OnInsertPrint(wxCommandEvent& event);
+    void OnToggleHelp(wxCommandEvent& event) { DoToggleHelp(); }
+
+    void OnToolLeftClick(wxCommandEvent& event);
+    void OnToolEnter(wxCommandEvent& event);
+
+    void OnCombo(wxCommandEvent& event);
+
+private:
+    void DoEnablePrint();
+    void DoDeletePrint();
+    void DoToggleHelp();
+
+    bool                m_smallToolbar;
+    wxTextCtrl*         m_textWindow;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+const int ID_TOOLBAR = 500;
+
+enum
+{
+    IDM_TOOLBAR_TOGGLETOOLBAR = 200,
+    IDM_TOOLBAR_ENABLEPRINT,
+    IDM_TOOLBAR_DELETEPRINT,
+    IDM_TOOLBAR_INSERTPRINT,
+    IDM_TOOLBAR_TOGGLEHELP,
+
+    ID_COMBO = 1000
+};
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+// Notice that wxID_HELP will be processed for the 'About' menu and the toolbar
+// help button.
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
+    EVT_MENU(wxID_HELP, MyFrame::OnAbout)
+
+    EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBAR, MyFrame::OnToggleToolbar)
+    EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)
+    EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
+    EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
+    EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
+
+    EVT_MENU(-1, MyFrame::OnToolLeftClick)
+
+    EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
+
+    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)
+
+// The `main program' equivalent, creating the windows and returning the
+// main frame
+bool MyApp::OnInit()
+{
+    // Create the main frame window
+    MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
+                                 "wxToolBar Sample",
+                                 wxPoint(100, 100), wxSize(450, 300));
+
+    // VZ: what's this for??
+#if 0
+    // Force a resize. This should probably be replaced by a call to a wxFrame
+    // function that lays out default decorations and the remaining content window.
+    wxSizeEvent event(wxSize(-1, -1), frame->GetId());
+    frame->OnSize(event);
+#endif // 0
+
+    frame->Show(TRUE);
+
+    frame->SetStatusText("Hello, wxWindows");
+
+    SetTopWindow(frame);
+
+    return TRUE;
+}
+
+bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
+{
+  // Set up toolbar
+  wxBitmap* toolBarBitmaps[8];
+
+#ifdef __WXMSW__
+  toolBarBitmaps[0] = new wxBitmap("icon1");
+  toolBarBitmaps[1] = new wxBitmap("icon2");
+  if ( !smallicons )
+  {
+      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 ( !smallicons )
+  {
+      toolBarBitmaps[2] = new wxBitmap( save_xpm );
+      toolBarBitmaps[3] = new wxBitmap( copy_xpm );
+      toolBarBitmaps[4] = new wxBitmap( cut_xpm );
+      toolBarBitmaps[5] = new wxBitmap( preview_xpm );
+      toolBarBitmaps[6] = new wxBitmap( print_xpm );
+      toolBarBitmaps[7] = new wxBitmap( help_xpm );
+  }
+#endif
+
+#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");
+
+  wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO);
+  combo->Append("This");
+  combo->Append("is a");
+  combo->Append("combobox");
+  combo->Append("in a");
+  combo->Append("toolbar");
+  toolBar->AddControl(combo);
+
+  if ( !smallicons )
+  {
+      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->Realize();
+
+  // Can delete the bitmaps since they're reference counted
+  int i, max = smallicons ? 2 : WXSIZEOF(toolBarBitmaps);
+  for (i = 0; i < max; i++)
+    delete toolBarBitmaps[i];
+
+  return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
+// 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)
+{
+    m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
+    m_smallToolbar = FALSE;
+
+    // Give it a status line
+    CreateStatusBar();
+
+    // Give it an icon
+    SetIcon(wxICON(mondrian));
+
+    // Make a menubar
+    wxMenu *tbarMenu = new wxMenu;
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBAR, "&Toggle toolbar\tCtrl-T", "Change the toolbar kind");
+    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button\tCtrl-E", "");
+    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", "");
+
+    wxMenu *fileMenu = new wxMenu;
+    fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
+
+    wxMenu *helpMenu = new wxMenu;
+    helpMenu->Append(wxID_HELP, "&About", "About toolbar sample");
+
+    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
+    SetMenuBar(menuBar);
+
+    // Create the toolbar
+    wxToolBar *tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL |
+                                    wxTB_FLAT | wxTB_DOCKABLE,
+                                    ID_TOOLBAR);
+
+    tbar->SetMargins( 4, 4 );
+
+    wxGetApp().InitToolbar(tbar);
+}
+
+void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event))
+{
+    // delete and recreate the toolbar
+    wxToolBar *tbar = GetToolBar();
+    delete tbar;
+
+    SetToolBar(NULL);
+    tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL |
+                         wxTB_FLAT | wxTB_DOCKABLE,
+                         ID_TOOLBAR);
+
+    m_smallToolbar = !m_smallToolbar;
+    wxGetApp().InitToolbar(tbar, m_smallToolbar);
+}
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
+}
+
+void MyFrame::OnToolLeftClick(wxCommandEvent& event)
+{
+    wxString str;
+    str.Printf( _T("Clicked on tool %d\n"), event.GetId());
+    m_textWindow->WriteText( str );
+
+    if (event.GetId() == wxID_HELP)
+    {
+        if ( event.GetExtraLong() != 0 )
+            m_textWindow->WriteText( _T("Help button down now.\n") );
+        else
+            m_textWindow->WriteText( _T("Help button up now.\n") );
+    }
+
+    if (event.GetId() == wxID_COPY)
+    {
+        DoEnablePrint();
+    }
+
+    if (event.GetId() == wxID_CUT)
+    {
+        DoToggleHelp();
+    }
+
+    if (event.GetId() == wxID_PRINT)
+    {
+        DoDeletePrint();
+    }
+}
+
+void MyFrame::OnCombo(wxCommandEvent& event)
+{
+    wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str());
+}
+
+void MyFrame::DoEnablePrint()
+{
+    wxToolBar *tb = GetToolBar();
+    if (tb->GetToolEnabled(wxID_PRINT))
+        tb->EnableTool( wxID_PRINT, FALSE );
+    else
+        tb->EnableTool( wxID_PRINT, TRUE );
+}
+
+void MyFrame::DoDeletePrint()
+{
+    wxToolBar *tb = GetToolBar();
+
+    tb->DeleteTool( wxID_PRINT );
+}
+
+void MyFrame::DoToggleHelp()
+{
+    wxToolBar *tb = GetToolBar();
+    tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
+}
+
+void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+    wxBitmap bmp("icon7");
+#else
+    wxBitmap bmp(print_xpm);
+#endif
+
+    GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap,
+                              FALSE, (wxObject *) NULL, "Delete this tool");
+
+    GetToolBar()->Realize();
+}
+
+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("");
+}
+
diff --git a/samples/toolbar/toolbar.def b/samples/toolbar/toolbar.def
new file mode 100644 (file)
index 0000000..897b9da
--- /dev/null
@@ -0,0 +1,8 @@
+NAME         ToolTest
+DESCRIPTION  'wxToolBar Sample'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     1024
+STACKSIZE    8192
diff --git a/samples/toolbar/toolbar.rc b/samples/toolbar/toolbar.rc
new file mode 100644 (file)
index 0000000..6c9086d
--- /dev/null
@@ -0,0 +1,13 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
+icon1 BITMAP "bitmaps/new.bmp"
+icon2 BITMAP "bitmaps/open.bmp"
+icon3 BITMAP "bitmaps/save.bmp"
+icon4 BITMAP "bitmaps/copy.bmp"
+icon5 BITMAP "bitmaps/cut.bmp"
+icon6 BITMAP "bitmaps/paste.bmp"
+icon7 BITMAP "bitmaps/print.bmp"
+
+icon8 BITMAP "bitmaps/help.bmp"
+